Merge remote-tracking branch 'remotes/origin/DFSMethod_getAllAvailableSteps' into DFSmethods

Author: LyashenkoGS

src/main/java/com/google/hashcode/utils/DFSMethods.java

@@ -4,9 +4,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public abstract class DFSMethods {
@@ -60,9 +58,10 @@ public static Optional<Slice> rightStep(Pizza pizza, Slice slice) {
      * @param output given slices in the pizza
      * @return available steps
      */
-    public static List<Step> getAvailableSteps(Pizza pizza, List<Slice> output) {
-        List<Step> steps = new ArrayList<>();
+    public static Map<Slice, List<Step>> getAvailableSteps(Pizza pizza, List<Slice> output) {
+        Map<Slice, List<Step>> groupedSteps = new HashMap<>();
         for (Slice slice : output) {
+            List<Step> steps = new ArrayList<>();
             Slice stepLeftDelta = slice.generateStepDeltaLeft();
             Slice stepRightDelta = slice.generateStepDeltaRight();
             Slice stepAboveDelta = slice.generateStepDeltaAbove();
@@ -71,12 +70,13 @@ public static List<Step> getAvailableSteps(Pizza pizza, List<Slice> output) {
             if (pizza.containsCells(stepRightDelta)) steps.add(new Step(slice, stepRightDelta));
             if (pizza.containsCells(stepAboveDelta)) steps.add(new Step(slice, stepAboveDelta));
             if (pizza.containsCells(stepBelowDelta)) steps.add(new Step(slice, stepBelowDelta));
+            groupedSteps.put(slice, steps);
         }
         LOGGER.info("available steps for" +
                 "\npizza: " + pizza
                 + "\nslices: " + output
-                + "\nsteps: " + steps);
-        return steps;
+                + "\nsteps: " + groupedSteps);
+        return groupedSteps;
     }
 
     public static Slice performStep(Pizza pizza, List<Step> steps) {

src/test/java/com/google/hashcode/utils/DFSMethodsTest.java

@@ -1,16 +1,14 @@
 package com.google.hashcode.utils;
 
-import com.google.hashcode.entity.Cell;
-import com.google.hashcode.entity.Ingredient;
-import com.google.hashcode.entity.Pizza;
-import com.google.hashcode.entity.Slice;
+import com.google.hashcode.entity.*;
 import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import static com.google.hashcode.utils.InputFiles.EXAMPLE_INPUT_FILE_PATH;
 import static org.junit.Assert.assertEquals;
@@ -37,8 +35,11 @@ public void rightStep() throws Exception {
     @Test
     public void getAvailableSteps() throws IOException {
         Pizza pizza = new Pizza(new File(EXAMPLE_INPUT_FILE_PATH), IoUtils.parsePizza(EXAMPLE_INPUT_FILE_PATH), IoUtils.parseSliceInstructions(EXAMPLE_INPUT_FILE_PATH));
-    assertEquals(8, DFSMethods.
-                getAvailableSteps(pizza, DFSMethods.cutAllStartPositions(pizza)).size());
+        Map<Slice, List<Step>> actualMap = DFSMethods.getAvailableSteps(pizza, DFSMethods.cutAllStartPositions(pizza));
+        assertEquals(3, actualMap.keySet().size());
+        assertEquals(3, actualMap.get(new Slice(new Cell(1,1, Ingredient.MUSHROOM))).size());
+        assertEquals(2, actualMap.get(new Slice(new Cell(1,2, Ingredient.MUSHROOM))).size());
+        assertEquals(3, actualMap.get(new Slice(new Cell(1,3, Ingredient.MUSHROOM))).size());
     }
 
     @Test