fix(day_02): remove inline solution

ankjevel · ankjevel · commit 3b2705c3930d · 2022-12-02T07:41:55.000Z
diff --git a/day_02/src/hand.rs b/day_02/src/hand.rs
@@ -5,7 +5,24 @@ pub enum Hand {
     Scissors,
 }
 
+pub enum Outcome {
+    Win,
+    Draw,
+    Lose,
+}
+
+impl Outcome {
+    pub fn sum(&self) -> u32 {
+        match self {
+            Win => 6,
+            Draw => 3,
+            Lose => 0,
+        }
+    }
+}
+
 use Hand::*;
+use Outcome::*;
 
 impl Hand {
     pub fn new(input: &char) -> Self {
@@ -16,7 +33,7 @@ impl Hand {
         }
     }
 
-    fn shape_sum(&self) -> u32 {
+    fn sum(&self) -> u32 {
         match self {
             Rock => 1,
             Paper => 2,
@@ -27,25 +44,54 @@ impl Hand {
     fn outcome(&self, opponent: &Hand) -> u32 {
         match opponent {
             Rock => match self {
-                Rock => 3,
-                Paper => 6,
-                Scissors => 0,
+                Rock => Draw.sum(),
+                Paper => Win.sum(),
+                Scissors => Lose.sum(),
             },
             Paper => match self {
-                Rock => 0,
-                Paper => 3,
-                Scissors => 6,
+                Rock => Lose.sum(),
+                Paper => Draw.sum(),
+                Scissors => Win.sum(),
             },
             Scissors => match self {
-                Rock => 6,
-                Paper => 0,
-                Scissors => 3,
+                Rock => Win.sum(),
+                Paper => Lose.sum(),
+                Scissors => Draw.sum(),
             },
         }
     }
 
-    pub fn round(&self, opponent: &Hand) -> u32 {
-        let shape_sum = self.shape_sum();
+    pub fn cheat(&self, opponent: &Hand) -> u32 {
+        match self {
+            Rock => {
+                Lose.sum()
+                    + match opponent {
+                        Rock => Scissors.sum(),
+                        Paper => Rock.sum(),
+                        Scissors => Paper.sum(),
+                    }
+            }
+            Paper => {
+                Draw.sum()
+                    + match opponent {
+                        Rock => Rock.sum(),
+                        Paper => Paper.sum(),
+                        Scissors => Scissors.sum(),
+                    }
+            }
+            Scissors => {
+                Win.sum()
+                    + match opponent {
+                        Rock => Paper.sum(),
+                        Paper => Scissors.sum(),
+                        Scissors => Rock.sum(),
+                    }
+            }
+        }
+    }
+
+    pub fn play(&self, opponent: &Hand) -> u32 {
+        let shape_sum = self.sum();
         let outcome = self.outcome(opponent);
         shape_sum + outcome
     }
diff --git a/day_02/src/part_01.rs b/day_02/src/part_01.rs
@@ -5,7 +5,7 @@ use crate::Input;
 pub fn main(input: &Input) -> Result<u32> {
     Ok(input
         .into_iter()
-        .map(|(opponent, elf)| elf.round(opponent))
+        .map(|(opponent, elf)| elf.play(opponent))
         .sum())
 }
 
diff --git a/day_02/src/part_02.rs b/day_02/src/part_02.rs
@@ -1,37 +1,11 @@
 use std::io::Result;
 
-use crate::Hand::*;
 use crate::Input;
 
 pub fn main(input: &Input) -> Result<u32> {
     Ok(input
         .into_iter()
-        .map(|(opponent, outcome)| match outcome {
-            // lose
-            Rock => {
-                0 + match opponent {
-                    Rock => 3,
-                    Paper => 1,
-                    Scissors => 2,
-                }
-            }
-            // draw
-            Paper => {
-                3 + match opponent {
-                    Rock => 1,
-                    Paper => 2,
-                    Scissors => 3,
-                }
-            }
-            // win
-            Scissors => {
-                6 + match opponent {
-                    Rock => 2,
-                    Paper => 3,
-                    Scissors => 1,
-                }
-            }
-        })
+        .map(|(opponent, instruction)| instruction.cheat(opponent))
         .sum())
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use crate::Input;`
`5`	`5`	`pub fn main(input: &Input) -> Result<u32> {`
`6`	`6`	`Ok(input`
`7`	`7`	`.into_iter()`
`8`		`- .map(\|(opponent, elf)\| elf.round(opponent))`
	`8`	`+ .map(\|(opponent, elf)\| elf.play(opponent))`
`9`	`9`	`.sum())`
`10`	`10`	`}`
`11`	`11`