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

Author: LyashenkoGS

src/main/java/com/google/hashcode/entity/Slice.java

@@ -61,6 +61,12 @@ public String toString() {
         return cells.toString();
     }
 
+
+    /**
+     * check if slice valid for current pizza.
+     * @param pizza
+     * @return
+     */
     public boolean isValid(Pizza pizza) {
         //TODO check rectangularity
         int mushroomsNumber = this.cells.stream()

src/main/java/com/google/hashcode/entity/Step.java

@@ -1,5 +1,7 @@
 package com.google.hashcode.entity;
 
+import java.util.List;
+
 /**
  * Step as an entity is a slice tha can be added to a particular slice inside a particular pizza, considering
  * pizza's slice instructions
@@ -25,4 +27,13 @@ public String toString() {
                 '}';
     }
 
+	public static boolean isValid(Pizza pizza, Slice startSlice, Slice checkedSlice){
+		if( pizza.containsCells(checkedSlice) &&
+				startSlice.cells.size() + checkedSlice.cells.size() <= pizza.getSliceInstruction().getMaxNumberOfCellsPerSlice()){
+			return true;
+		}
+
+		return false;
+	}
+
 }

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

@@ -20,26 +20,26 @@ private DFSMethods() {
      * For each slice find all available steps. We DON'T change the pizza on this stage
      *
      * @param pizza  given pizza
-     * @param output given slices in the pizza
+     * @param startPos given slices in the pizza
      * @return available steps
      */
-    public static Map<Slice, List<Step>> getAvailableSteps(Pizza pizza, List<Slice> output) {
+    public static Map<Slice, List<Step>> getAvailableSteps(Pizza pizza, List<Slice> startPos) {
         Map<Slice, List<Step>> groupedSteps = new HashMap<>();
-        for (Slice slice : output) {
+        for (Slice slice : startPos) {
             List<Step> steps = new ArrayList<>();
             Slice stepLeftDelta = slice.generateStepDeltaLeft();
             Slice stepRightDelta = slice.generateStepDeltaRight();
             Slice stepAboveDelta = slice.generateStepDeltaAbove();
             Slice stepBelowDelta = slice.generateStepDeltaBelow();
-            if (pizza.containsCells(stepLeftDelta)) steps.add(new Step(slice, stepLeftDelta));
-            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));
+            if (Step.isValid(pizza, slice, stepLeftDelta)) steps.add(new Step(slice, stepLeftDelta));
+            if (Step.isValid(pizza, slice, stepRightDelta)) steps.add(new Step(slice, stepRightDelta));
+            if (Step.isValid(pizza, slice, stepAboveDelta)) steps.add(new Step(slice, stepAboveDelta));
+            if (Step.isValid(pizza, slice, stepBelowDelta)) steps.add(new Step(slice, stepBelowDelta));
             groupedSteps.put(slice, steps);
         }
         LOGGER.info("available steps for" +
                 "\npizza: " + pizza
-                + "\nslices: " + output
+                + "\nslices: " + startPos
                 + "\nsteps: " + groupedSteps);
         return groupedSteps;
     }