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

Author: LyashenkoGS

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

@@ -41,4 +41,8 @@ public int hashCode() {
     public int getX() {
         return x;
     }
+
+    public int getY() {
+        return y;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.google.hashcode.entity;
 
 import java.io.File;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
@@ -51,13 +52,36 @@ public SliceInstruction getSliceInstruction() {
 
     @Override
     public String toString() {
-        return input.toString() +
-                //TODO fix human readable output   "\n" + IoUtils.convertToHumanReadableTable(cells) +
-                "\n" + sliceInstruction.toString();
+        return input.toString()
+                + ("\n" + sliceInstruction.toString()
+                + "\n" + outputCellsArray()).trim();
     }
-    
+
     public boolean cotnainsAllCells(Slice slice){
     	return slice.cells.stream().allMatch(cell->this.cells.contains(cell));
     }
-    		
+
+
+    private String outputCellsArray() {
+        StringBuilder stringBuilder = new StringBuilder();
+        int columnsCount = cells.stream().max(Comparator.comparingInt(Cell::getX)).get().getX();
+        int rowsCount = cells.stream().max(Comparator.comparingInt(Cell::getY)).get().getY();
+        //output columns coordinates
+        stringBuilder.append(" ");
+        for (int column = 0; column < columnsCount + 1; column++) {
+            stringBuilder.append(" ").append(column);
+        }
+        stringBuilder.append("\n");
+        for (int row = 0; row < rowsCount + 1; row++) {
+            //output rows coordinates
+            stringBuilder.append(row).append(" ");
+            for (int column = 0; column < columnsCount + 1; column++) {
+                stringBuilder.append(this.getCell(row, column).toString()).append(" ");
+            }
+            stringBuilder.append("\n");
+        }
+        return stringBuilder.toString();
+    }
+
+
 }

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

@@ -72,24 +72,6 @@ public static SliceInstruction parseSliceInstructions(String file) throws IOExce
         }
     }
 
-    /**
-     * Converts given pizza cells 2d array to human readable string representation
-     *
-     * @param ingredients given array
-     * @return table like String representation
-     */
-    public static String convertToHumanReadableTable(Cell[][] ingredients) {
-        StringBuilder output = new StringBuilder();
-        for (Cell[] row : ingredients) {
-            for (Cell cell : row) {
-                output.append(cell).append(" ");
-            }
-            output.append("\n");
-        }
-        return output.toString();
-        //TODO reimplement for the pizza
-    }
-
     /**
      * Formats data from list of slices to the required output format
      *

src/test/java/com/google/hashcode/entity/PizzaTest.java

@@ -1,12 +1,12 @@
 package com.google.hashcode.entity;
 
-import com.google.hashcode.utils.InputFiles;
 import com.google.hashcode.utils.IoUtils;
 import org.junit.Test;
 
 import java.io.File;
+import java.io.IOException;
 
-import static com.google.hashcode.utils.InputFiles.*;
+import static com.google.hashcode.utils.InputFiles.EXAMPLE_INPUT_FILE_PATH;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -26,4 +26,16 @@ public void getCellException() throws Exception {
         pizza.getCell(100500, 0);
     }
 
+    @Test
+    public void testToString() throws IOException {
+        Pizza pizza = new Pizza(new File(EXAMPLE_INPUT_FILE_PATH), IoUtils.parsePizza(EXAMPLE_INPUT_FILE_PATH), IoUtils.parseSliceInstructions(EXAMPLE_INPUT_FILE_PATH));
+        System.out.println(pizza);
+        assertEquals("inputDataSets/example.inSliceInstructions: \n" +
+                "min 1 ingredient per slice, max 6 cells per slice \n" +
+                "  0 1 2 3 4\n" +
+                "0 T T T T T \n" +
+                "1 T M M M T \n" +
+                "2 T T T T T", pizza.toString());
+    }
+
 }

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

@@ -33,11 +33,11 @@ private static List<Slice> createSlicesForParagonOutputExample() {
         slice0.cells.add(new Cell(0, 1, Ingredient.TOMATO));
         slice0.cells.add(new Cell(1, 1, Ingredient.MUSHROOM));
         slice0.cells.add(new Cell(2, 1, Ingredient.TOMATO));
-    
+
         slice1.cells.add(new Cell(0, 2, Ingredient.TOMATO));
         slice1.cells.add(new Cell(1, 2, Ingredient.MUSHROOM));
         slice1.cells.add(new Cell(2, 2, Ingredient.TOMATO));
-    
+
         slice2.cells.add(new Cell(0, 3, Ingredient.TOMATO));
         slice2.cells.add(new Cell(1, 3, Ingredient.MUSHROOM));
         slice2.cells.add(new Cell(2, 3, Ingredient.TOMATO));
@@ -50,11 +50,7 @@ private static List<Slice> createSlicesForParagonOutputExample() {
 
     @Test
     public void parseExampleInput() throws IOException {
-   /*     List<Cell> ing = IoUtils.parsePizza(EXAMPLE_PIZZA_FILE);
-        assertEquals("We expect" + EXAMPLE_PIZZA_FILE + "contains 3 rows", 3, ingredients.size);
-        assertEquals("We expect" + EXAMPLE_PIZZA_FILE + "contains 5 columns", 5, ingredients[0].length);
-        assertFalse("We expect no null value in ingredients", IoUtils.convertToHumanReadableTable(ingredients).contains("null"));
-   */
+        List<Cell> input = IoUtils.parsePizza(EXAMPLE_PIZZA_FILE);
     }
 
     @Test