fixMediumPizzaSlicing. Fix getAllAvailableSteps for big arrays

Author: LyashenkoGS

.gitignore

@@ -7,6 +7,7 @@
 target
 #ignore the archived source code and output files
 /outputDataSet/*
+*.log
 *.zip
 /.classpath
 .settings/

src/main/java/com/google/hashcode/App.java

@@ -24,7 +24,7 @@ public class App {
     public static void main(String[] args) throws IOException {
         slicePizza(EXAMPLE_INPUT_FILE_PATH, OUTPUT_DATA_SET_EXAMPLE_TXT);
         slicePizza(SMALL_INPUT_FILE_PATH, OUTPUT_DATA_SET_SMALL_TXT);
-        slicePizza(MEDIUM_INPUT_FILE_PATH, OUTPUT_DATA_SET_MEDIUM_TXT);
+        //slicePizza(MEDIUM_INPUT_FILE_PATH, OUTPUT_DATA_SET_MEDIUM_TXT);
         //TODO troubles to input big files, possible exciting String max size
         //slicePizza(BIG_INPUT_FILE_PATH, OUTPUT_DATA_SET_BIG_TXT);
     }
@@ -48,6 +48,9 @@ public static void slicePizza(String inputFile, String outputFile) throws IOExce
         }
         IoUtils.writeToFile(outputFile, IoUtils.parseSlices(output));
         LOGGER.info("FINISHED for " + inputFile + "!!!!!");
+        LOGGER.info("sliced cells number: " + output.stream()
+                .map(slice -> slice.cells.size())
+                .reduce(0, (integer, integer2) -> integer + integer2));
         LOGGER.info(profiler.measure(inputFile + " execution time: "));
     }
 

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

@@ -22,7 +22,8 @@ public Step(Slice startPosition, Slice delta) {
     public boolean isValid(Pizza pizza) {
         Slice slice = new Slice(new ArrayList<>(startPosition.cells));
         slice.cells.addAll(delta.cells);
-        return slice.isValid(pizza);
+        return slice.isValid(pizza) ||
+                slice.cells.size() < pizza.getSliceInstruction().getMaxNumberOfCellsPerSlice();
     }
 
     public int size() {

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

@@ -15,14 +15,16 @@ private DFSMethods() {
 
     /**
      * For each slice find all available steps.<br>
-     * If founded start position that haven't any steps and it is unvalid ->
-     * remove this slice from startPositions and add all it's cells to pizza.
+     * If used start position hasn't any steps and is invalid for a pizza ->
+     * remove this slice from startPositions and add all it's cells to the pizza.
+     *
      * @param pizza          given pizza
      * @param startPositions given slices in the pizza
-     * @param output
+     * @param output         list of valid slices
      * @return available steps
      */
     public static Map<Slice, List<Step>> getAvailableSteps(Pizza pizza, List<Slice> startPositions, List<Slice> output) {
+        Profiler profiler = new Profiler();
         Map<Slice, List<Step>> groupedSteps = new HashMap<>();
         Iterator iter = startPositions.iterator();
         while (iter.hasNext()) {
@@ -40,9 +42,9 @@ public static Map<Slice, List<Step>> getAvailableSteps(Pizza pizza, List<Slice>
             steps.add(stepAbove);
             steps = steps.stream().filter(Objects::nonNull).collect(Collectors.toList());
 
-            if (steps.size() == 0) {
+            if (steps.isEmpty()) {
                 if (startPosition.isValid(pizza)) {
-                    // if slice is valid and have'nt any steps -> cut it from
+                    // if slice is valid and haven't any steps -> cut it from
                     // startPositions
                     output.add(startPosition);
                     iter.remove();
@@ -66,10 +68,10 @@ public static Map<Slice, List<Step>> getAvailableSteps(Pizza pizza, List<Slice>
      * Pick-ups a step with a minimal cells delta number,
      * execute it(cut it from the pizza, and add to a slice)
      *
-     * @param pizza given pizza
-     * @param step  step to perform
+     * @param pizza          given pizza
+     * @param step           step to perform
      * @param startPositions
-     *@param output @return formed slice that includes an original slice and delta from a step
+     * @param output         @return formed slice that includes an original slice and delta from a step
      */
     public static void performStep(Pizza pizza, Step step, List<Slice> startPositions, List<Slice> output) {
         //1. Pick ups a steps list with minimal total cells number
@@ -89,9 +91,9 @@ public static void performStep(Pizza pizza, Step step, List<Slice> startPosition
         LOGGER.info("PIZZA AFTER STEP:" + pizza);
         //3. Add the step cells to an output slice
 
-        if(finalSlice.cells.size() == pizza.getSliceInstruction().getMaxNumberOfCellsPerSlice()){
+        if (finalSlice.cells.size() == pizza.getSliceInstruction().getMaxNumberOfCellsPerSlice()) {
             output.add(finalSlice);
-        } else{
+        } else {
             startPositions.add(finalSlice);
         }
     }

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

@@ -40,12 +40,9 @@ public static List<Cell> parsePizza(String file) throws IOException {
             List<Cell> cells = new ArrayList<>();
             int row = 0;
             String fileLine;
-            int counter = 0;
             while ((fileLine = br.readLine()) != null) {
                 for (int column = 0; column < fileLine.length(); column++) {
                     Character literal = fileLine.charAt(column);
-                    counter ++;
-                    System.out.println("letter " + literal + " counter = " + counter);
                     if (literal.toString().equals(Ingredient.TOMATO.toString())) {
                         cells.add(new Cell(row, column, Ingredient.TOMATO));
                     } else if (literal.toString().equals(Ingredient.MUSHROOM.toString())) {

src/main/resources/logback.xml

@@ -9,12 +9,24 @@
         </layout>
     </appender>
 
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>./pizzaSlicing.log</file>
+        <append>false</append>
+        <encoder>
+            <pattern>
+                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
     <root level="debug">
         <appender-ref ref="STDOUT"/>
     </root>
 
-    <logger name="com.google" level="debug"
+    <logger name="com.google" level="info"
             additivity="false">
+        <appender-ref ref="FILE"/>
         <appender-ref ref="STDOUT"/>
     </logger>
+
 </configuration>