DFSmethods. Pre-repease refactoring.

Release notes
1.Simplest working algorithm for pizza slicing.

Author: LyashenkoGS

.gitignore

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

README.md

@@ -1,5 +1,7 @@
 # GoogleHashCode2017  
+hash tags: #hashcode #2017 #googleHashCode 
 ![google hash code logo](./documentation/logo.png)
+[![Build Status](https://travis-ci.org/LyashenkoGS/GoogleHashCode2017.svg?branch=master)](https://travis-ci.org/LyashenkoGS/GoogleHashCode2017)
 
 ##Pizza
 Practice problem for the Google HashCode 2017

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

@@ -13,20 +13,23 @@
 import java.util.List;
 import java.util.Map;
 
-import static com.google.hashcode.utils.InputFiles.EXAMPLE_INPUT_FILE_PATH;
+import static com.google.hashcode.utils.FilesPaths.*;
 
 
 public class App {
     private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
 
     public static void main(String[] args) throws IOException {
-        slicePizza(EXAMPLE_INPUT_FILE_PATH, "outputDataSet/example.txt");
-
+        slicePizza(EXAMPLE_INPUT_FILE_PATH, OUTPUT_DATA_SET_EXAMPLE_TXT);
+        slicePizza(SMALL_INPUT_FILE_PATH, OUTPUT_DATA_SET_SMALL_TXT);
+        //TODO troubles to input big files, possible exciting String max size
+        //slicePizza(BIG_INPUT_FILE_PATH, OUTPUT_DATA_SET_BIG_TXT);
+        //slicePizza(MEDIUM_INPUT_FILE_PATH, OUTPUT_DATA_SET_MEDIUM_TXT);
     }
 
-    public static void slicePizza(String exampleInputFilePath, String outputFile) throws IOException {
+    public static void slicePizza(String inputFile, String outputFile) throws IOException {
         List<Slice> output;
-        Pizza pizza = new Pizza(new File(exampleInputFilePath), IoUtils.parsePizza(exampleInputFilePath), IoUtils.parseSliceInstructions(exampleInputFilePath));
+        Pizza pizza = new Pizza(new File(inputFile), IoUtils.parsePizza(inputFile), IoUtils.parseSliceInstructions(inputFile));
         //get start positions
         output = DFSMethods.cutAllStartPositions(pizza);
         //get All steps
@@ -35,12 +38,13 @@ public static void slicePizza(String exampleInputFilePath, String outputFile) th
             Step step = DFSMethods.selectStep(availableSteps);
             output.remove(step.startPosition);
             output.add(DFSMethods.performStep(pizza, step));
+            //TODO available steps should include merging slices to each other
             availableSteps = DFSMethods.getAvailableSteps(pizza, output);
             LOGGER.info("OUTPUT AFTER A STEP: "
                     + "\n " + output);
         }
         IoUtils.writeToFile(outputFile, IoUtils.parseSlices(output));
-        LOGGER.info("FINISHED for " + exampleInputFilePath + "!!!!!");
+        LOGGER.info("FINISHED for " + inputFile + "!!!!!");
     }
 
 }

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

@@ -196,7 +196,7 @@ public Step generateStepRight(Pizza pizza) {
         Slice delta = new Slice();
         for (int y = this.minY(); y <= this.maxY(); y++) {
             //try to get a cell
-            Optional<Cell> cell = pizza.getCell(y, maxX()+1);
+            Optional<Cell> cell = pizza.getCell(y, maxX() + 1);
             if (cell.isPresent()) {
                 delta.cells.add(cell.get());
             } else {

src/main/java/com/google/hashcode/service/Slicer.java

@@ -0,0 +1,22 @@
+package com.google.hashcode.utils;
+
+/**
+ * Contains common files to perform input-output
+ *
+ * @author Grigoriy Lyashenko (Grog).
+ */
+public abstract class FilesPaths {
+    public static final String EXAMPLE_INPUT_FILE_PATH = "inputDataSets/example.in";
+    public static final String SMALL_INPUT_FILE_PATH = "inputDataSets/small.in";
+    public static final String MEDIUM_INPUT_FILE_PATH = "inputDataSets/medium.in";
+    public static final String BIG_INPUT_FILE_PATH = "inputDataSets/big.in";
+
+
+    public static final String OUTPUT_DATA_SET_EXAMPLE_TXT = "outputDataSet/example.txt";
+    public static final String OUTPUT_DATA_SET_SMALL_TXT = "outputDataSet/small.txt";
+    public static final String OUTPUT_DATA_SET_BIG_TXT = "outputDataSet/big.txt";
+    public static final String OUTPUT_DATA_SET_MEDIUM_TXT = "outputDataSet/medium.txt";
+
+    private FilesPaths() {
+    }
+}

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

@@ -4,11 +4,11 @@
 
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author Grigoriy Lyashenko (Grog).
  */
+//TODO examine this class work by parameterized tests
 public class StepsComparator implements Comparator<List<Step>> {
 
     @Override

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

@@ -10,11 +10,11 @@
     </appender>
 
     <root level="debug">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </root>
 
     <logger name="com.google" level="debug"
             additivity="false">
-        <appender-ref ref="STDOUT" />
+        <appender-ref ref="STDOUT"/>
     </logger>
 </configuration>

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

@@ -8,7 +8,7 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import static com.google.hashcode.utils.InputFiles.EXAMPLE_INPUT_FILE_PATH;
+import static com.google.hashcode.utils.FilesPaths.EXAMPLE_INPUT_FILE_PATH;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;