commit 5416627d0db61db06a77b23e26f9febdc166d5ea Author: agp8x Date: Fri Apr 7 13:02:32 2017 +0200 implement GridBoard data structure diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..1f2af51 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0fa1f56 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..85b44fb --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..402fa47 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,38 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.2" + defaultConfig { + applicationId "org.agp8x.android.games.fillgrid" + minSdkVersion 25 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + jackOptions { + enabled true + } + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + compile fileTree(include: ['*.jar'], dir: 'libs') + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.0' + compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9' + testCompile 'junit:junit:4.12' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..9b05117 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/agp8x/bin/android-sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/org/agp8x/android/games/fillgrid/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/agp8x/android/games/fillgrid/ExampleInstrumentedTest.java new file mode 100644 index 0000000..e69a60b --- /dev/null +++ b/app/src/androidTest/java/org/agp8x/android/games/fillgrid/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package org.agp8x.android.games.fillgrid; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("org.agp8x.android.games.fillgrid", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..e42b01e --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/FillGrid.java b/app/src/main/java/org/agp8x/android/games/fillgrid/FillGrid.java new file mode 100644 index 0000000..15699c6 --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/FillGrid.java @@ -0,0 +1,22 @@ +package org.agp8x.android.games.fillgrid; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import org.agp8x.android.games.fillgrid.data.GridBlock; +import org.agp8x.android.games.fillgrid.data.GridObject; + +public class FillGrid extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_fill_grid); + + //GridObject sgo = new GridBlock<>("asdf"); + //GridObject ago = new GridBlock<>(Asdf.A); + } + private enum Asdf{ + A,B,C; + } +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/Cell.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Cell.java new file mode 100644 index 0000000..06f07ef --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Cell.java @@ -0,0 +1,9 @@ +package org.agp8x.android.games.fillgrid.data; + +/** + * Created by clemensk on 07.04.17. + */ + +public interface Cell { + String getTableSymbol(); +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/Coordinate.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Coordinate.java new file mode 100644 index 0000000..fecb450 --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Coordinate.java @@ -0,0 +1,57 @@ +package org.agp8x.android.games.fillgrid.data; + +/** + * Created by clemensk on 29.03.17. + */ + +public class Coordinate { + private double x; + private double y; + + public Coordinate() { + } + + public Coordinate(double x, double y) { + this.x = x; + this.y = y; + } + + public double getX() { + return x; + } + + public void setX(double x) { + this.x = x; + } + + public double getY() { + return y; + } + + public void setY(double y) { + this.y = y; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Coordinate that = (Coordinate) o; + + if (Double.compare(that.x, x) != 0) return false; + return Double.compare(that.y, y) == 0; + + } + + @Override + public int hashCode() { + int result; + long temp; + temp = Double.doubleToLongBits(x); + result = (int) (temp ^ (temp >>> 32)); + temp = Double.doubleToLongBits(y); + result = 31 * result + (int) (temp ^ (temp >>> 32)); + return result; + } +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/Grid.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Grid.java new file mode 100644 index 0000000..d771ef4 --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Grid.java @@ -0,0 +1,18 @@ +package org.agp8x.android.games.fillgrid.data; + +import java.util.Map; + +/** + * Created by clemensk on 29.03.17. + */ + +public interface Grid, C extends Cell> { + C getAt(Offset xy); + + boolean drop(Offset xy, G object); + + Map getGrid(); + + void clear(); +} + diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridBlock.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridBlock.java new file mode 100644 index 0000000..406f980 --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridBlock.java @@ -0,0 +1,47 @@ +package org.agp8x.android.games.fillgrid.data; + +import java.util.HashMap; +import java.util.Map; + +/** + * Created by clemensk on 29.03.17. + */ + +public class GridBlock implements GridObject { + private final Map content; + + public GridBlock(Map content) { + this.content = new HashMap<>(content); + } + + @Override + public Map getObjects() { + return content; + } + + @Override + public boolean isEmpty() { + return content.isEmpty(); + } + + @Override + public GridObject duplicate() { + return new GridBlock<>(content); + } + + @Override + public Offset getDimensions() { + if (content.isEmpty()) { + return new Offset(0, 0); + } + Offset min = content.keySet().stream().findFirst().get(); + Offset max = min; + for (Offset offset : content.keySet()) { + min = Offset.min(min, offset); + max = Offset.max(max, offset); + } + System.out.println(max); + System.out.println(min); + return new Offset(1 + max.x - min.x, 1 + max.y - min.y); + } +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridBoard.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridBoard.java new file mode 100644 index 0000000..c506bcb --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridBoard.java @@ -0,0 +1,103 @@ +package org.agp8x.android.games.fillgrid.data; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +/** + * Represents a GridBoard in its entirety, i.e. Top level object + * + * @author clemens + */ + +public class GridBoard, C extends Cell> implements Grid { + private final Map contents; + private final Offset dimensions; + + public GridBoard(int heigth, int width) { + this.contents = new HashMap<>(); + dimensions = new Offset(width, heigth); + } + + @Override + public C getAt(Offset xy) { + return contents.get(xy); + } + + @Override + public boolean drop(Offset xy, G object) { + if (fits(xy, object)) { + object.getObjects().forEach((offset, cell) -> contents.put(Offset.add(xy, offset), cell)); + return true; + } + return false; + } + + @Override + public Map getGrid() { + return contents; + } + + @Override + public void clear() { + contents.clear(); + } + + /** + * Check whether a given object can be placed on a given origin + * + * @param xy origin to place object on + * @param newObject object to place + * @return true if possible + */ + private boolean fits(Offset xy, G newObject) { + Map objects = newObject.getObjects(); + return (objects.isEmpty()) || // object has no cells => fits + (objects.keySet().stream(). + filter(Objects::nonNull). // null cells are ignored + filter(offset -> !isSettable(xy, offset)). //clash with existing key + count() == 0); + } + + /** + * Determine whether a cell at origin + offset is available for setting. + * Both clipping against outer boundaries and checks for already occupied cells is performed. + * + * @param origin absolute origin position + * @param offset offset of cell to set from origin position + * @return true when possible, false otherwise + */ + private boolean isSettable(Offset origin, Offset offset) { + Offset xy = Offset.add(origin, offset); + if ((xy.x < 0 || xy.x > dimensions.x) || (xy.y < 0 || xy.y > dimensions.y)) { + return false; + } + C obj1 = contents.get(xy); + return obj1 == null; + } + + public String symbolTable() { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < dimensions.y; i++) { + sb.append("\n|"); + for (int j = 0; j < dimensions.x; j++) { + Offset xy = new Offset(j, i); + if (contents.containsKey(xy)) { + sb.append(contents.get(xy).getTableSymbol()).append(""); + } else { + sb.append(" "); + } + } + sb.append("|"); + } + return sb.toString(); + } + + @Override + public String toString() { + return "GridBoard{" + + "contents=" + contents + + ", dimensions=" + dimensions + + '}' + symbolTable(); + } +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridObject.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridObject.java new file mode 100644 index 0000000..6354b5f --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/GridObject.java @@ -0,0 +1,17 @@ +package org.agp8x.android.games.fillgrid.data; + +import java.util.Map; + +/** + * Created by clemensk on 29.03.17. + */ + +public interface GridObject { + Map getObjects(); + + boolean isEmpty(); + + GridObject duplicate(); + + Offset getDimensions(); +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/Offset.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Offset.java new file mode 100644 index 0000000..58080b0 --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/Offset.java @@ -0,0 +1,59 @@ +package org.agp8x.android.games.fillgrid.data; + +/** + * Created by clemensk on 29.03.17. + */ + +class Offset { + public final int x; + public final int y; + + public Offset(int x, int y) { + this.x = x; + this.y = y; + } + + public boolean isPositive() { + System.out.println((x > 0) +"; "+ (y>0)); + return x > 0 && y > 0; + } + + public static Offset max(Offset o1, Offset o2) { + return new Offset(Math.max(o1.x, o2.x), Math.max(o1.y, o2.y)); + } + + public static Offset min(Offset o1, Offset o2) { + return new Offset(Math.min(o1.x, o2.x), Math.min(o1.y, o2.y)); + } + + @Override + public String toString() { + return "Offset{" + + "x=" + x + + ", y=" + y + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Offset offset = (Offset) o; + + if (x != offset.x) return false; + return y == offset.y; + + } + + @Override + public int hashCode() { + int result = x; + result = 31 * result + y; + return result; + } + + public static Offset add(Offset origin, Offset offset) { + return new Offset(origin.x + offset.x, origin.y + offset.y); + } +} diff --git a/app/src/main/java/org/agp8x/android/games/fillgrid/data/StringCell.java b/app/src/main/java/org/agp8x/android/games/fillgrid/data/StringCell.java new file mode 100644 index 0000000..e81f939 --- /dev/null +++ b/app/src/main/java/org/agp8x/android/games/fillgrid/data/StringCell.java @@ -0,0 +1,33 @@ +package org.agp8x.android.games.fillgrid.data; + +/** + * Created by clemensk on 07.04.17. + */ + +public class StringCell implements Cell { + private String value; + + public StringCell(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + @Override + public String toString() { + return "StringCell{" + + "value='" + value + '\'' + + '}'; + } + + @Override + public String getTableSymbol() { + return value.substring(0,1); + } +} diff --git a/app/src/main/res/layout/activity_fill_grid.xml b/app/src/main/res/layout/activity_fill_grid.xml new file mode 100644 index 0000000..1f1763c --- /dev/null +++ b/app/src/main/res/layout/activity_fill_grid.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9a078e3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..efc028a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..3af2608 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..9bec2e6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..34947cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..55160d3 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + FillGrid + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/org/agp8x/android/games/fillgrid/ExampleUnitTest.java b/app/src/test/java/org/agp8x/android/games/fillgrid/ExampleUnitTest.java new file mode 100644 index 0000000..247b342 --- /dev/null +++ b/app/src/test/java/org/agp8x/android/games/fillgrid/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package org.agp8x.android.games.fillgrid; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/app/src/test/java/org/agp8x/android/games/fillgrid/data/GridBlockTest.java b/app/src/test/java/org/agp8x/android/games/fillgrid/data/GridBlockTest.java new file mode 100644 index 0000000..6f393ae --- /dev/null +++ b/app/src/test/java/org/agp8x/android/games/fillgrid/data/GridBlockTest.java @@ -0,0 +1,62 @@ +package org.agp8x.android.games.fillgrid.data; + +import org.junit.Before; +import org.junit.Test; + +import java.util.HashMap; + +import static org.junit.Assert.*; + +/** + * Created by clemensk on 29.03.17. + */ +public class GridBlockTest { + private GridBlock grid; + + @Before + public void setUp() throws Exception { + grid = new GridBlock<>(new HashMap<>()); + grid.getObjects().put(new Offset(0, 0), new StringCell("center")); + grid.getObjects().put(new Offset(1, 1), new StringCell("top-right")); + grid.getObjects().put(new Offset(1, -1), new StringCell("bottom-right")); + } + + @Test + public void getDimensions() throws Exception { + /* + * oox + * oxo- + * oox + */ + assertEquals(new Offset(2, 3), grid.getDimensions()); + /* + * xxx + * oxo- + * oox + */ + grid.getObjects().put(new Offset(-1, 1), new StringCell("top-left")); + grid.getObjects().put(new Offset(0, 1), new StringCell("top-center")); + assertEquals(new Offset(3, 3), grid.getDimensions()); + /* + * ooxxx + * oox + * oox + */ + grid.getObjects().clear(); + grid.getObjects().put(new Offset(1, 1), new StringCell("top-right")); + grid.getObjects().put(new Offset(2, 1), new StringCell("top-right2")); + grid.getObjects().put(new Offset(3, 1), new StringCell("top-right3")); + grid.getObjects().put(new Offset(1, 0), new StringCell("center-right")); + grid.getObjects().put(new Offset(1, -1), new StringCell("bottom-right")); + assertEquals(new Offset(3, 3), grid.getDimensions()); + /* + * ooxxx + * ooo + * ooo + */ + grid.getObjects().remove(new Offset(1, 0), new StringCell("center-right")); + grid.getObjects().remove(new Offset(1, -1), new StringCell("bottom-right")); + assertEquals(new Offset(3, 1), grid.getDimensions()); + } + +} \ No newline at end of file diff --git a/app/src/test/java/org/agp8x/android/games/fillgrid/data/GridBoardTest.java b/app/src/test/java/org/agp8x/android/games/fillgrid/data/GridBoardTest.java new file mode 100644 index 0000000..bb85621 --- /dev/null +++ b/app/src/test/java/org/agp8x/android/games/fillgrid/data/GridBoardTest.java @@ -0,0 +1,42 @@ +package org.agp8x.android.games.fillgrid.data; + +import org.junit.Before; +import org.junit.Test; + +import java.util.HashMap; + +import static org.junit.Assert.*; + +/** + * Created by clemensk on 07.04.17. + */ +public class GridBoardTest { + private GridBoard, StringCell> board; + + @Before + public void setUp() throws Exception { + board = new GridBoard<>(4, 4); + } + + @Test + public void testToString() throws Exception { + System.out.println(board); + GridBlock block0 = new GridBlock<>(new HashMap<>()); + block0.getObjects().put(new Offset(0, 0), new StringCell("a")); + block0.getObjects().put(new Offset(1, 1), new StringCell("b")); + block0.getObjects().put(new Offset(1, -1), new StringCell("c")); + block0.getObjects().put(new Offset(-1, -1), new StringCell("y")); + block0.getObjects().put(new Offset(-1, 1), new StringCell("x")); + board.drop(new Offset(1, 1), block0); + System.out.println(board.symbolTable()); + GridBlock block1 = new GridBlock<>(new HashMap<>()); + block1.getObjects().put(new Offset(0,0), new StringCell("1")); + block1.getObjects().put(new Offset(0,1), new StringCell("2")); + block1.getObjects().put(new Offset(0,2), new StringCell("3")); + block1.getObjects().put(new Offset(0,3), new StringCell("4")); + board.drop(new Offset(0,0), block1); + System.out.println(board.symbolTable()); + board.drop(new Offset(3,0), block1); + System.out.println(board.symbolTable()); + } +} \ No newline at end of file diff --git a/app/src/test/java/org/agp8x/android/games/fillgrid/data/OffsetTest.java b/app/src/test/java/org/agp8x/android/games/fillgrid/data/OffsetTest.java new file mode 100644 index 0000000..9789560 --- /dev/null +++ b/app/src/test/java/org/agp8x/android/games/fillgrid/data/OffsetTest.java @@ -0,0 +1,50 @@ +package org.agp8x.android.games.fillgrid.data; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Created by clemensk on 29.03.17. + */ +public class OffsetTest { + private Offset o0; + private Offset o1; + private Offset o2; + private Offset o3; + private Offset o4; + + @Before + public void setUp() throws Exception { + o0= new Offset(0,0); + o1 = new Offset(1,2); + o2 = new Offset(-1,3); + o3 = new Offset(3,-5); + o4 = new Offset(-4,10); + } + + @Test + public void max() throws Exception { + assertEquals(new Offset(1,2), Offset.max(o0,o1)); + assertEquals(new Offset(0,3), Offset.max(o0,o2)); + assertEquals(new Offset(3,0), Offset.max(o0,o3)); + assertEquals(new Offset(0,10), Offset.max(o0,o4)); + assertEquals(new Offset(1,3), Offset.max(o1,o2)); + assertEquals(new Offset(3,2), Offset.max(o1,o3)); + assertEquals(new Offset(1,10), Offset.max(o1,o4)); + } + + @Test + public void min() throws Exception { + assertEquals(new Offset(0,0), Offset.min(o0,o1)); + assertEquals(new Offset(-1,0), Offset.min(o0,o2)); + assertEquals(new Offset(0,-5), Offset.min(o0,o3)); + assertEquals(new Offset(-4,0), Offset.min(o0,o4)); + assertEquals(new Offset(0,0), Offset.min(o1,o0)); + assertEquals(new Offset(-1,2), Offset.min(o1,o2)); + assertEquals(new Offset(1,-5), Offset.min(o1,o3)); + assertEquals(new Offset(-4,2), Offset.min(o1,o4)); + } + +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1ea4bd0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..374d51a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Mar 29 12:22:49 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'