Add coordinats(x,y) to each pizza cell

Author: LyashenkoGS

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

@@ -1,7 +1,8 @@
 package com.google.hashcode;
 
+import com.google.hashcode.entity.Cell;
+import com.google.hashcode.entity.Ingredient;
 import com.google.hashcode.entity.Pizza;
-import com.google.hashcode.entity.PizzaCell;
 import com.google.hashcode.utils.IoUtils;
 
 import java.io.File;
@@ -11,8 +12,8 @@
 public class App {
     public static void main(String[] args) throws IOException {
         String exampleInputFile = "inputDataSets/example.in";
-        PizzaCell[][] pizzaCells = IoUtils.parsePizza(exampleInputFile);
-        Pizza pizza = new Pizza(new File(exampleInputFile), pizzaCells, IoUtils.parseSliceInstructions(exampleInputFile));
+        Cell[][] ingredients = IoUtils.parsePizza(exampleInputFile);
+        Pizza pizza = new Pizza(new File(exampleInputFile), ingredients, IoUtils.parseSliceInstructions(exampleInputFile));
 
         System.out.println("GoogleHashCode2017! Pizza task");
         System.out.print(pizza);

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

@@ -0,0 +1,23 @@
+package com.google.hashcode.entity;
+
+/**
+ * Represents a pizza cell with it coordinates. There is no getters/setters for simplicity
+ *
+ * @author Grigoriy Lyashenko (Grog).
+ */
+public class Cell {
+    final int x;
+    final int y;
+    final Ingredient ingredient;
+
+    public Cell(int x, int y, Ingredient ingredient) {
+        this.x = x;
+        this.y = y;
+        this.ingredient = ingredient;
+    }
+
+    @Override
+    public String toString() {
+        return ingredient.toString();
+    }
+}

…om/google/hashcode/entity/PizzaCell.java …m/google/hashcode/entity/Ingredient.javasrc/main/java/com/google/hashcode/entity/PizzaCell.java renamed to src/main/java/com/google/hashcode/entity/Ingredient.java src/main/java/com/google/hashcode/entity/PizzaCell.java renamed to src/main/java/com/google/hashcode/entity/Ingredient.java

@@ -5,11 +5,11 @@
  *
  * @author Grigoriy Lyashenko (Grog).
  */
-public enum PizzaCell {
+public enum Ingredient {
     MUSHROOM("M"), TOMATO("T");
     private final String type;
 
-    PizzaCell(final String type) {
+    Ingredient(final String type) {
         this.type = type;
     }
 

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

@@ -12,28 +12,28 @@
 public class Pizza {
 
     private final File input;
-    private final PizzaCell[][] pizzaCells;
+    private final Cell[][] cells;
     private final SliceInstruction sliceInstruction;
 
-    public Pizza(File input, PizzaCell[][] pizzaCells, SliceInstruction sliceInstruction) {
+    public Pizza(File input, Cell[][] cells, SliceInstruction sliceInstruction) {
         this.input = input;
-        this.pizzaCells = pizzaCells;
+        this.cells = cells;
         this.sliceInstruction = sliceInstruction;
     }
 
     public File getInput() {
         return input;
     }
 
-    public PizzaCell[][] getPizzaCells() {
-        return pizzaCells;
+    public Cell[][] getCells() {
+        return cells;
     }
 
 
     @Override
     public String toString() {
         return input.toString() +
-                "\n" + IoUtils.convertToHumanReadableTable(pizzaCells) +
+                "\n" + IoUtils.convertToHumanReadableTable(cells) +
                 "\n" + sliceInstruction.toString();
     }
 

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

@@ -1,6 +1,7 @@
 package com.google.hashcode.utils;
 
-import com.google.hashcode.entity.PizzaCell;
+import com.google.hashcode.entity.Cell;
+import com.google.hashcode.entity.Ingredient;
 import com.google.hashcode.entity.SliceInstruction;
 
 import java.io.BufferedReader;
@@ -19,29 +20,29 @@ public class IoUtils {
      * @return 2d array representing a pizza
      * @throws IOException parsing fail
      */
-    public static PizzaCell[][] parsePizza(String file) throws IOException {
+    public static Cell[][] parsePizza(String file) throws IOException {
         try (FileReader fileReader = new FileReader(file)) {
             BufferedReader br = new BufferedReader(fileReader);
             //parse the first line
             String[] headerTokens = br.readLine().split(" ");
             int rowsCount = Integer.parseInt(headerTokens[0]);
             int columnsCount = Integer.parseInt(headerTokens[1]);
             //declare a pizza cells array
-            PizzaCell[][] pizzaCells = new PizzaCell[rowsCount][columnsCount];
+            Cell[][] ingredients = new Cell[rowsCount][columnsCount];
             int row = 0;
             String fileLine;
             while ((fileLine = br.readLine()) != null) {
-                for (int i = 0; i < fileLine.length(); i++) {
-                    Character literal = fileLine.charAt(i);
-                    if (literal.toString().equals(PizzaCell.TOMATO.toString())) {
-                        pizzaCells[row][i] = PizzaCell.TOMATO;
-                    } else if (literal.toString().equals(PizzaCell.MUSHROOM.toString())) {
-                        pizzaCells[row][i] = PizzaCell.MUSHROOM;
+                for (int column = 0; column < fileLine.length(); column++) {
+                    Character literal = fileLine.charAt(column);
+                    if (literal.toString().equals(Ingredient.TOMATO.toString())) {
+                        ingredients[row][column] = new Cell(column, row, Ingredient.TOMATO);
+                    } else if (literal.toString().equals(Ingredient.MUSHROOM.toString())) {
+                        ingredients[row][column] = new Cell(column, row, Ingredient.MUSHROOM);
                     }
                 }
                 row++;
             }
-            return pizzaCells;
+            return ingredients;
         }
     }
 
@@ -66,13 +67,13 @@ public static SliceInstruction parseSliceInstructions(String file) throws IOExce
     /**
      * Converts given pizza cells 2d array to human readable string representation
      *
-     * @param pizzaCells given array
+     * @param ingredients given array
      * @return table like String representation
      */
-    public static String convertToHumanReadableTable(PizzaCell[][] pizzaCells) {
+    public static String convertToHumanReadableTable(Cell[][] ingredients) {
         StringBuilder output = new StringBuilder();
-        for (Enum[] row : pizzaCells) {
-            for (Enum cell : row) {
+        for (Cell[] row : ingredients) {
+            for (Cell cell : row) {
                 output.append(cell).append(" ");
             }
             output.append("\n");

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

@@ -1,6 +1,7 @@
 package com.google.hashcode.utils;
 
-import com.google.hashcode.entity.PizzaCell;
+import com.google.hashcode.entity.Cell;
+import com.google.hashcode.entity.Ingredient;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -16,10 +17,10 @@ public class IoUtilsTest {
 
     @Test
     public void parseExampleInput() throws IOException {
-        PizzaCell[][] pizzaCells = IoUtils.parsePizza(examplePizzaFile);
-        assertEquals("We expect" + examplePizzaFile + "contains 3 rows", 3, pizzaCells.length);
-        assertEquals("We expect" + examplePizzaFile + "contains 5 columns", 5, pizzaCells[0].length);
-        assertFalse("We expect no null value in pizzaCells", IoUtils.convertToHumanReadableTable(pizzaCells).contains("null"));
+        Cell[][] ingredients = IoUtils.parsePizza(examplePizzaFile);
+        assertEquals("We expect" + examplePizzaFile + "contains 3 rows", 3, ingredients.length);
+        assertEquals("We expect" + examplePizzaFile + "contains 5 columns", 5, ingredients[0].length);
+        assertFalse("We expect no null value in ingredients", IoUtils.convertToHumanReadableTable(ingredients).contains("null"));
     }
 
     @Test