Skip to content

Commit 6805ab0

Browse files
committed
DFS_getAllAvaliableSteps. Fix a bug with the getAvaliableSteps method.
1 parent 7275380 commit 6805ab0

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public Slice generateStepDeltaBelow() {
110110
public Slice generateStepDeltaLeft() {
111111
List<Cell> delta = new ArrayList<>();
112112
for (int y = this.minY(); y <= this.maxY(); y++) {
113-
Cell cell = new Cell(y, minX(), Ingredient.TOMATO);
113+
Cell cell = new Cell(y, minX() -1 , Ingredient.TOMATO);
114114
delta.add(cell);
115115
}
116116
LOGGER.info("generateStepDeltaLeft"
@@ -119,10 +119,10 @@ public Slice generateStepDeltaLeft() {
119119
return new Slice(delta);
120120
}
121121

122-
public Slice generateStepRight() {
122+
public Slice generateStepDeltaRight() {
123123
List<Cell> delta = new ArrayList<>();
124124
for (int y = this.minY(); y <= this.maxY(); y++) {
125-
Cell cell = new Cell(y, minX(), Ingredient.TOMATO);
125+
Cell cell = new Cell(y, maxX() + 1, Ingredient.TOMATO);
126126
delta.add(cell);
127127
}
128128
LOGGER.info("generateStepDeltaRight"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static List<Step> getAvailableSteps(Pizza pizza, List<Slice> output) {
6464
List<Step> steps = new ArrayList<>();
6565
for (Slice slice : output) {
6666
Slice stepLeftDelta = slice.generateStepDeltaLeft();
67-
Slice stepRightDelta = slice.generateStepRight();
67+
Slice stepRightDelta = slice.generateStepDeltaRight();
6868
Slice stepAboveDelta = slice.generateStepDeltaAbove();
6969
Slice stepBelowDelta = slice.generateStepDeltaBelow();
7070
if (pizza.containsCells(stepLeftDelta)) steps.add(new Step(slice, stepLeftDelta));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public void generateStepRight() {
5555
Slice slice = new Slice(Arrays.asList(
5656
new Cell(0, 0, Ingredient.MUSHROOM),
5757
new Cell(0, 1, Ingredient.TOMATO)));
58-
assertEquals(1, slice.generateStepRight().cells.size());
58+
assertEquals(1, slice.generateStepDeltaRight().cells.size());
5959
}
6060
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public void rightStep() throws Exception {
3737
@Test
3838
public void getAvailableSteps() throws IOException {
3939
Pizza pizza = new Pizza(new File(EXAMPLE_INPUT_FILE_PATH), IoUtils.parsePizza(EXAMPLE_INPUT_FILE_PATH), IoUtils.parseSliceInstructions(EXAMPLE_INPUT_FILE_PATH));
40-
/* TODO find a bug and fix assertEquals(8, DFSMethods.
40+
assertEquals(8, DFSMethods.
4141
getAvailableSteps(pizza, DFSMethods.cutAllStartPositions(pizza)).size());
42-
*/}
42+
}
4343

4444
@Test
4545
public void cutAllStartPositions() throws IOException {

0 commit comments

Comments
 (0)