From 7f79c6079ae7aeda9a8286e92c26cb628d50920d Mon Sep 17 00:00:00 2001
From: Dan Chadwick <dan@danchadwickdesign.com>
Date: Sun, 24 Nov 2024 10:06:50 -0500
Subject: [PATCH] Making things more versatile for day 2.

---
 2015/days/day2.php | 28 ++++++++--------------------
 2015/solutions.php |  4 ++--
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/2015/days/day2.php b/2015/days/day2.php
index f5aa9ec..35f5a6e 100644
--- a/2015/days/day2.php
+++ b/2015/days/day2.php
@@ -64,35 +64,23 @@ class Box {
 
 }
 
-function day2part1() {
+function day2(int $part = 1) {
   $box_dimension_list = file_get_contents('./2015/inputs/day2.txt');
   $box_dimension_list = explode(PHP_EOL, $box_dimension_list);
-  $wrapping_paper_total = 0;
+  $total = 0;
   foreach ($box_dimension_list as $box_dimensions) {
     if (strlen($box_dimensions) < 1) {
       continue;
     }
     $box = new Box();
     $box->extractDimensions($box_dimensions);
-    $wrapping_paper_total = $wrapping_paper_total + $box->calculateRequiredFootage();
-  }
-  return $wrapping_paper_total;
-}
-
-function day2part1b() {
-  $box_dimension_list = file_get_contents('./2015/inputs/day2.txt');
-  $box_dimension_list = explode(PHP_EOL, $box_dimension_list);
-  $ribbon_requirements = 0;
-  foreach ($box_dimension_list as $box_dimensions) {
-    if (strlen($box_dimensions) < 1) {
-      continue;
+    if ($part == 1) {
+      $total = $total + $box->calculateRequiredFootage();
+    }
+    elseif ($part == 2) {
+      $total = $total + $box->calculateRibbonRequirements();
     }
-    $box = new Box();
-    $box->extractDimensions($box_dimensions);
-    $ribbon_requirements = $ribbon_requirements + $box->calculateRibbonRequirements();
   }
-
-  return $ribbon_requirements;
+  return $total;
 }
 
-
diff --git a/2015/solutions.php b/2015/solutions.php
index e559a5d..a5e97b2 100644
--- a/2015/solutions.php
+++ b/2015/solutions.php
@@ -8,8 +8,8 @@ foreach ($days as $day) {
 $solutions = [];
 $solutions['day_1']['part_1'] = day1solution1();
 $solutions['day_1']['part_2'] = day1solution1b();
-$solutions['day_2']['part_1'] = day2part1();
-$solutions['day_2']['part_2'] = day2part1b();
+$solutions['day_2']['part_1'] = day2(1);
+$solutions['day_2']['part_2'] = day2(2);
 
 // OUTPUT THE SOLUTIONS WE HAVE.
 foreach ($solutions as $day => $parts) {