aoc_lib: add aoc::read_vector()

Author: yut23

2023/src/day07.hpp

@@ -8,6 +8,7 @@
 #ifndef DAY07_HPP_QKDJV1MU
 #define DAY07_HPP_QKDJV1MU
 
+#include "lib.hpp"    // for read_vector
 #include <algorithm>  // for sort
 #include <array>      // for array
 #include <cassert>    // for assert
@@ -180,6 +181,7 @@ struct Hand {
     int bid;
     HandType hand_type;
 
+    Hand() : Hand({}, 0) {}
     Hand(const std::array<Card, 5> &cards, int bid)
         : cards(cards), bid(bid), hand_type(identify_hand(cards)){};
     Hand(const Card &card1, const Card &card2, const Card &card3,
@@ -226,12 +228,7 @@ std::ostream &operator<<(std::ostream &os, const Hand &hand) {
 }
 
 std::vector<Hand> read_hands(std::istream &is) {
-    std::vector<Hand> hands;
-    Hand hand{{}, 0};
-    while (is >> hand) {
-        hands.push_back(std::move(hand));
-    }
-    return hands;
+    return aoc::read_vector<Hand>(is);
 }
 
 } // namespace aoc::day07

2023/src/day09.hpp

@@ -8,6 +8,7 @@
 #ifndef DAY09_HPP_UZDLAO3M
 #define DAY09_HPP_UZDLAO3M
 
+#include "lib.hpp" // for read_vector
 #include <cassert> // for assert
 #include <cstddef> // for size_t
 #include <sstream> // for istringstream
@@ -18,12 +19,7 @@ namespace aoc::day09 {
 
 std::vector<int> read_history(const std::string &line) {
     std::istringstream ss{line};
-    std::vector<int> history;
-    int x;
-    while (ss >> x) {
-        history.push_back(x);
-    }
-    return history;
+    return aoc::read_vector<int>(ss);
 }
 
 std::vector<int> diff(const std::vector<int> &vec) {

2023/src/day24.hpp

@@ -9,7 +9,7 @@
 #define DAY24_HPP_PKLXENFE
 
 #include "ds/grid.hpp"      // for Grid
-#include "lib.hpp"          // for expect_input
+#include "lib.hpp"          // for expect_input, read_vector
 #include <cassert>          // for assert
 #include <cmath>            // for copysign
 #include <cstddef>          // for size_t
@@ -137,12 +137,7 @@ make_system(const std::vector<aoc::day24::Hailstone> &stones,
 }
 
 std::vector<Hailstone> read_stones(std::istream &is) {
-    std::vector<Hailstone> stones;
-    Hailstone stone{};
-    while (is >> stone) {
-        stones.push_back(std::move(stone));
-    }
-    return stones;
+    return aoc::read_vector<Hailstone>(is);
 }
 
 } // namespace aoc::day24

2024/src/day02.hpp

@@ -8,12 +8,12 @@
 #ifndef DAY02_HPP_QMMUZCBK
 #define DAY02_HPP_QMMUZCBK
 
+#include "lib.hpp"   // for read_vector
 #include <algorithm> // for copy
 #include <cstdlib>   // for abs, size_t
 #include <iostream>  // for istream
 #include <sstream>   // for istringstream
 #include <string>    // for string, getline
-#include <utility>   // for move
 #include <vector>    // for vector
 
 namespace aoc::day02 {
@@ -57,12 +57,7 @@ auto read_input(std::istream &is) {
     std::vector<std::vector<int>> reports;
     while (std::getline(is, line)) {
         std::istringstream ss(line);
-        std::vector<int> levels;
-        int tmp;
-        while (ss >> tmp) {
-            levels.push_back(tmp);
-        }
-        reports.push_back(std::move(levels));
+        reports.push_back(aoc::read_vector<int>(ss));
     }
     return reports;
 }

2024/src/day07.hpp

@@ -67,10 +67,7 @@ std::istream &operator>>(std::istream &is, Equation &eqn) {
     if (std::getline(is, line)) {
         std::istringstream iss{line};
         iss >> test_value >> expect_input(':');
-        long x;
-        while (iss >> x) {
-            operands.push_back(x);
-        }
+        operands = aoc::read_vector<long>(iss);
     }
     if (is) {
         eqn.test_value = test_value;
@@ -79,14 +76,7 @@ std::istream &operator>>(std::istream &is, Equation &eqn) {
     return is;
 }
 
-auto read_input(std::istream &is) {
-    std::vector<Equation> equations;
-    Equation eqn;
-    while (is >> eqn) {
-        equations.push_back(std::move(eqn));
-    }
-    return equations;
-}
+auto read_input(std::istream &is) { return aoc::read_vector<Equation>(is); }
 
 } // namespace aoc::day07
 

2024/src/day21.hpp

@@ -389,12 +389,7 @@ std::vector<Code> read_input(std::istream &is) {
     std::string line;
     while (std::getline(is, line)) {
         std::istringstream iss{line};
-        Code code{std::move(line)};
-        Key key{};
-        while (iss >> key) {
-            code.keys.push_back(key);
-        }
-        codes.push_back(std::move(code));
+        codes.push_back({std::move(line), aoc::read_vector<Key>(iss)});
     }
     return codes;
 }

aoc_lib/src/lib.hpp

@@ -504,6 +504,19 @@ std::vector<std::string> read_lines(std::istream &is) {
     return lines;
 }
 
+/**
+ * @brief Reads arbitrary objects from a stream into a vector.
+ */
+template <typename T>
+std::vector<T> read_vector(std::istream &is) {
+    std::vector<T> vec;
+    T t{};
+    while (is >> t) {
+        vec.push_back(std::move(t));
+    }
+    return vec;
+}
+
 } // namespace aoc
 
 template <std::integral int_type>