From 1b8919b2833d5908923d90a2dcc708e53bbbae8c Mon Sep 17 00:00:00 2001
From: anthonycicc <me@anthonycicchetti.com>
Date: Mon, 2 Dec 2019 17:29:49 -0500
Subject: [PATCH] Day 1 part 2 complete

---
 justfile                     |  4 ++--
 src/main/kotlin/CliParser.kt | 10 +++++-----
 src/main/kotlin/day1/Day1.kt | 21 +++++++++++++++++----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/justfile b/justfile
index 0420f39..2a8f95b 100644
--- a/justfile
+++ b/justfile
@@ -1,5 +1,5 @@
-run day inputFile: build
-    java -jar ./build/libs/adventOfCode2019-1.0-SNAPSHOT-all.jar --day-to-run={{day}} --input-file={{inputFile}}
+run day part inputFile: build
+    java -jar ./build/libs/adventOfCode2019-1.0-SNAPSHOT-all.jar --day-to-run={{day}} --part-to-run={{part}} --input-file={{inputFile}}
 
 build:
     ./gradlew clean shadowJar
diff --git a/src/main/kotlin/CliParser.kt b/src/main/kotlin/CliParser.kt
index 6efb328..8dd99f3 100644
--- a/src/main/kotlin/CliParser.kt
+++ b/src/main/kotlin/CliParser.kt
@@ -8,14 +8,14 @@ import kotlin.RuntimeException
 
 class CliParser: CliktCommand() {
     private val dayToRun: String by option(help = "Day to Run. Can be either an int (1) or a String (Day1)").required()
+    private val partToRun: String by option(help = "Part to run. Usually 1 or 2").required()
     private val inputFile: Path by option().path().required()
 
     override fun run() {
-        println("dayToRun = $dayToRun")
-        println("inputFile = $inputFile")
-        when(dayToRun.replace("Day", "")) {
-            "1" -> println(Day1().run(inputFile))
-            else -> throw RuntimeException("Day not implementation yet")
+        when(val it = "${dayToRun.replace("Day", "")}.${partToRun}") {
+            "1.1" -> println(Day1().runPart1(inputFile))
+            "1.2" -> println(Day1().runPart2(inputFile))
+            else -> throw RuntimeException("Day or part (${it}) not implementation yet")
         }
     }
 }
diff --git a/src/main/kotlin/day1/Day1.kt b/src/main/kotlin/day1/Day1.kt
index 36bb425..e3c07c0 100644
--- a/src/main/kotlin/day1/Day1.kt
+++ b/src/main/kotlin/day1/Day1.kt
@@ -5,14 +5,27 @@ import java.nio.file.Path
 import java.util.stream.Collectors
 
 class Day1 {
-    fun run(inputFile: Path): Long {
+    fun runPart1(inputFile: Path): Long {
         return loadFile(inputFile).parallelStream()
-            .map {calculateCost(it)}
+            .map {calculateCost(it.toLong())}
             .collect(Collectors.summingLong { it } )
     }
 
-    private fun calculateCost(x: String): Long {
-        return x.toLong().div(3).minus(2)
+    fun runPart2(inputFile: Path): Long {
+        return loadFile(inputFile).parallelStream()
+            .map {calculateCostPart2(it.toLong())}
+            .collect(Collectors.summingLong { it } )
+    }
+
+    private fun calculateCost(x: Long): Long {
+        return x.div(3).minus(2)
+    }
+
+    private fun calculateCostPart2(x: Long): Long {
+        return when (x > 6) {
+            false -> 0
+            true -> { val temp = calculateCost(x); temp + calculateCostPart2(temp) }
+        }
     }
 
     private fun loadFile(inputFile: Path): List<String> {