[TASK] Solved Day 4

.run/Run-aoc2022-bench-dayX.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run-aoc2022-bench-dayX" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --package advent-of-code-2022-rust --bin advent-of-code-2022-rust --release -- -d 3 -b 1000" />
+    <option name="command" value="run --package advent-of-code-2022-rust --bin advent-of-code-2022-rust --release -- -d 4 -b 1000" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />

input/day4_example.txt

@@ -0,0 +1,6 @@
+2-4,6-8
+2-3,4-5
+5-7,7-9
+2-8,3-7
+6-6,4-6
+2-6,4-8

src/day4.rs

@@ -0,0 +1,81 @@
+use regex::Regex;
+use crate::day_solver::DaySolver;
+
+use super::util;
+
+struct Range {
+    start: u8,
+    end: u8
+}
+
+struct ElfPair {
+    range1: Range,
+    range2: Range
+}
+
+pub struct Day4 {
+    elfs: Vec<ElfPair>
+}
+
+impl Day4 {
+
+    pub fn create() -> Self {
+        // let lines = util::read_file("input/day4_example.txt");
+        let lines = util::read_file("input/day4.txt");
+
+        // let re = Regex::new(r"(\d+)-(\d+),(\d+)-(\d+)").unwrap();
+        // // Put the input into the day struct
+        // return Day4 {
+        //     elfs: lines.iter().map(|s| {
+        //         let caps = re.captures(s.as_ref())
+        //             .unwrap();
+        //         ElfPair {
+        //             range1: Range {
+        //                 start: caps.get(1).unwrap().as_str().parse().unwrap(),
+        //                 end:  caps.get(2).unwrap().as_str().parse().unwrap()
+        //             },
+        //             range2: Range {
+        //                 start: caps.get(3).unwrap().as_str().parse().unwrap(),
+        //                 end:  caps.get(4).unwrap().as_str().parse().unwrap()
+        //             },
+        //         }
+        //     })
+        //         .collect()
+        // }
+        return Day4 {
+            elfs: lines.iter().map(|s| {
+                let mut split = s.split(",");
+                ElfPair {
+                    range1: Day4::parse_range(split.next().unwrap()),
+                    range2: Day4::parse_range(split.next().unwrap())
+                }
+            })
+                .collect()
+        }
+    }
+
+    fn parse_range(str: &str) -> Range {
+        let mut res = str.split('-');
+        Range {
+            start: res.next().unwrap().parse::<u8>().unwrap(),
+            end: res.next().unwrap().parse::<u8>().unwrap()
+        }
+    }
+}
+
+impl DaySolver for Day4 {
+
+    fn solve_part1(&mut self) -> String {
+        return self.elfs.iter()
+            .filter(|e| (e.range1.start >= e.range2.start && e.range1.end <= e.range2.end) || (e.range2.start >= e.range1.start && e.range2.end <= e.range1.end))
+            .count()
+            .to_string()
+    }
+
+    fn solve_part2(&mut self) -> String {
+        return self.elfs.iter()
+            .filter(|e| e.range1.start <= e.range2.end && e.range1.end >= e.range2.start)
+            .count()
+            .to_string()
+    }
+}

src/dayX.rs

@@ -12,7 +12,7 @@ impl DayX {
         let lines = util::read_file("input/dayX.txt");
 
         // Put the input into the day struct
-        return Day2 {}
+        return DayX {}
     }
 }
 

src/main.rs

@@ -2,6 +2,7 @@ use std::time::Instant;
 use crate::day1::Day1;
 use crate::day2::Day2;
 use crate::day3::Day3;
+use crate::day4::Day4;
 use crate::day_solver::DaySolver;
 
 mod util;
@@ -9,8 +10,9 @@ mod day1;
 mod day_solver;
 mod day2;
 mod day3;
+mod day4;
 
-const MAX_DAY: u8 = 2;
+const MAX_DAY: u8 = 4;
 const DEFAULT_BENCHMARK_AMOUNT: u32 = 100;
 
 fn main() {
@@ -55,11 +57,12 @@ fn main() {
         print_bench_result(&bench_results, |b| b.init, "Initialization");
         print_bench_result(&bench_results, |b| b.part1, "Part 1");
         print_bench_result(&bench_results, |b| b.part2, "Part 2");
+        print_bench_result(&bench_results, |b| b.part1 + b.part2, "Part 1 & 2 together");
 
-        println!("First time took {} μs (init {} μs, part 1: {} μs, part 2: {} μs", first_run_bench.total, first_run_bench.init, first_run_bench.part1, first_run_bench.part2);
+        println!("First time took {} μs (init {} μs, part 1: {} μs, part 2: {} μs)", first_run_bench.total, first_run_bench.init, first_run_bench.part1, first_run_bench.part2);
 
     } else {
-        println!("Execution took {} μs (init {} μs, part 1: {} μs, part 2: {} μs", first_run_bench.total, first_run_bench.init, first_run_bench.part1, first_run_bench.part2);
+        println!("Execution took {} μs (init {} μs, part 1: {} μs, part 2: {} μs)", first_run_bench.total, first_run_bench.init, first_run_bench.part1, first_run_bench.part2);
     }
 }
 
@@ -76,6 +79,7 @@ fn build_day_solver(day: u8) -> Option<Box<dyn DaySolver>> {
         1 => Some(Box::new(Day1::create())),
         2 => Some(Box::new(Day2::create())),
         3 => Some(Box::new(Day3::create())),
+        4 => Some(Box::new(Day4::create())),
         _ => None
     }
 }