sim642
diff --git a/‎src/main/scala/eu/sim642/adventofcode2018/Day7.scala
Lines changed: 23 additions & 21 deletions b/‎src/main/scala/eu/sim642/adventofcode2018/Day7.scala
Lines changed: 23 additions & 21 deletions
@@ -18,25 +18,10 @@ object Day7 {
   def parallelTopologicalSort(reqs: Requirements, workerCount: Int = 5, baseStepTime: Int = 60): Int = {
 
     case class Work(step: Step, timeLeft: Int)
+    type Workers = Seq[Option[Work]]
 
-    def helper(reqs: Requirements, workers: Seq[Option[Work]], inProgress: Set[Step]): Int = {
-      def pickWork(reqs: Requirements, workers: Seq[Option[Work]], inProgress: Set[Step]) = {
-        reqs.values.reduceOption(_ ++ _) match {
-          case None => (reqs, workers :+ None, inProgress)
-          case Some(haveReqStep) =>
-            val possibleSteps = reqs.keySet -- haveReqStep -- inProgress
-            if (possibleSteps.nonEmpty) {
-              val step = possibleSteps.min
-              (reqs, workers :+ Some(Work(step, baseStepTime + (step.toInt - 'A'.toInt + 1) - 1)), inProgress + step)
-            }
-            else
-              (reqs, workers :+ None, inProgress)
-        }
-      }
-
-      println(s"1: $workers $inProgress")
-
-      val (reqs2, workers2, inProgress2) = workers.foldLeft((reqs, Seq.empty[Option[Work]], inProgress))({
+    def tickTime(reqs: Requirements, workers: Workers, inProgress: Set[Step]) = {
+      workers.foldLeft((reqs, Seq.empty[Option[Work]], inProgress))({
         case ((reqs, workers, inProgress), None) =>
           (reqs, workers :+ None, inProgress)
 
@@ -48,18 +33,35 @@ object Day7 {
           else
             (reqs, workers :+ Some(Work(step, timeLeft - 1)), inProgress)
       })
+    }
 
-      println(s"2: $workers2 $inProgress2")
+    def pickWork(reqs: Requirements, workers: Workers, inProgress: Set[Step]) = {
+      reqs.values.reduceOption(_ ++ _) match {
+        case None => (reqs, workers :+ None, inProgress)
+        case Some(haveReqStep) =>
+          val possibleSteps = reqs.keySet -- haveReqStep -- inProgress
+          if (possibleSteps.nonEmpty) {
+            val step = possibleSteps.min
+            (reqs, workers :+ Some(Work(step, baseStepTime + (step.toInt - 'A'.toInt + 1) - 1)), inProgress + step)
+          }
+          else
+            (reqs, workers :+ None, inProgress)
+      }
+    }
 
-      val (reqs3, workers3, inProgress3) = workers2.foldLeft((reqs2, Seq.empty[Option[Work]], inProgress2))({
+    def pickWorks(reqs: Requirements, workers: Workers, inProgress: Set[Step]) = {
+      workers.foldLeft((reqs, Seq.empty[Option[Work]], inProgress))({
         case ((reqs, workers, inProgress), None) =>
           pickWork(reqs, workers, inProgress)
 
         case ((reqs, workers, inProgress), s@Some(Work(step, timeLeft))) =>
           (reqs, workers :+ s, inProgress)
       })
+    }
 
-      println(s"3: $workers3 $inProgress3")
+    def helper(reqs: Requirements, workers: Workers, inProgress: Set[Step]): Int = {
+      val (reqs2, workers2, inProgress2) = tickTime(reqs, workers, inProgress)
+      val (reqs3, workers3, inProgress3) = pickWorks(reqs2, workers2, inProgress2)
 
       if (reqs3.isEmpty && inProgress3.isEmpty)
         return 0