diff --git a/uil/october-2013/12/bin/CheckerBoard.class b/uil/october-2013/12/bin/CheckerBoard.class index e0336f3..e3874c7 100644 Binary files a/uil/october-2013/12/bin/CheckerBoard.class and b/uil/october-2013/12/bin/CheckerBoard.class differ diff --git a/uil/october-2013/12/bin/Point.class b/uil/october-2013/12/bin/Point.class index 1ffdf68..cb97d49 100644 Binary files a/uil/october-2013/12/bin/Point.class and b/uil/october-2013/12/bin/Point.class differ diff --git a/uil/october-2013/12/bin/problem12.class b/uil/october-2013/12/bin/problem12.class index 6b98887..1250e4b 100644 Binary files a/uil/october-2013/12/bin/problem12.class and b/uil/october-2013/12/bin/problem12.class differ diff --git a/uil/october-2013/12/src/problem12.java b/uil/october-2013/12/src/problem12.java index f98ece6..3954ba5 100644 --- a/uil/october-2013/12/src/problem12.java +++ b/uil/october-2013/12/src/problem12.java @@ -2,6 +2,8 @@ import static java.lang.System.*; import java.io.File; import java.io.FileNotFoundException; import java.util.Arrays; +import java.util.List; +import java.util.ArrayList; import java.util.Scanner; class Point { @@ -11,19 +13,30 @@ class Point { this.x = x; this.y = y; } + + void merge(Point other) { + this.x += other.x; + this.y += other.y; + } + + void merge(int x, int y) { + this.x += x; + this.y += y; + } } class CheckerBoard { - Point[] offsets = {Point(1, 1), Point(-1, -1), Point(-1, 1), Point(1, -1)}; + List offsets = Arrays.asList(new Point[]{Point(1, 1), Point(-1, -1), Point(-1, 1), Point(1, -1)}); CheckerBoard(String[][] matrix) { } - int[][] getPossible(int x, int y) { - return getPossible(x, y, new int[0][0]); + List getPossible(int x, int y) { + return getPossible(x, y, new ArrayList()); } - int[][] getPossible(int x, int y, List blacklist) {} + + List getPossible(int x, int y, List blacklist) {} } class problem12 { diff --git a/uil/october-2013/3/java/.idea/vcs.xml b/uil/october-2013/3/java/.idea/vcs.xml new file mode 100644 index 0000000..4fce1d8 --- /dev/null +++ b/uil/october-2013/3/java/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/uil/october-2013/3/java/.idea/workspace.xml b/uil/october-2013/3/java/.idea/workspace.xml index 7318077..fdfc5a1 100644 --- a/uil/october-2013/3/java/.idea/workspace.xml +++ b/uil/october-2013/3/java/.idea/workspace.xml @@ -1,7 +1,17 @@ - + + + + + + + + + + + - + - - + + + + + + @@ -62,6 +108,14 @@ + + + out.println + + + +