Added PositionQueries.add()

Author: Bytekeeper

src/main/java/org/bk/ass/query/PositionQueries.java

@@ -81,28 +81,23 @@ public int size() {
   }
 
   /**
-   * Removes the given element, the internal data structure will not be changed - queries will
-   * therefore not be faster.
+   * Adds the given element, the internal data structure will not be changed - query performance
+   * will suffer.
    */
   @Override
-  public boolean remove(Object o) {
+  public boolean add(U u) {
+    Node node = findNodeFor(u);
+    Object[] newValues = Arrays.copyOf(node.values, node.values.length + 1);
+    newValues[node.values.length] = u;
+    node.values = newValues;
+    return true;
+  }
+
+  private Node findNodeFor(Object o) {
     Node current = root;
     boolean xDim = true;
     while (current != null) {
-      if (current.values != null && current.values.length > 0) {
-        Object[] replacement = new Object[current.values.length - 1];
-        int i;
-        for (i = 0; i < replacement.length && !Objects.equals(current.values[i], o); i++) {
-          replacement[i] = current.values[i];
-        }
-        if (i == replacement.length) return false;
-        for (; i < replacement.length; i++) {
-          replacement[i] = current.values[i + 1];
-        }
-        current.values = replacement;
-        size--;
-        return true;
-      }
+      if (current.values != null) return current;
       Position pos = positionExtractor.apply((U) o);
       if (xDim && pos.x <= current.p || !xDim && pos.y <= current.p) {
         current = current.left;
@@ -111,6 +106,30 @@ public boolean remove(Object o) {
       }
       xDim = !xDim;
     }
+    throw new IllegalStateException("No node with values found!");
+  }
+
+  /**
+   * Removes the given element, the internal data structure will not be changed - queries will
+   * therefore not be faster.
+   */
+  @Override
+  public boolean remove(Object o) {
+    Node node = findNodeFor(o);
+    if (node.values.length > 0) {
+      Object[] replacement = new Object[node.values.length - 1];
+      int i;
+      for (i = 0; i < replacement.length && !Objects.equals(node.values[i], o); i++) {
+        replacement[i] = node.values[i];
+      }
+      if (i == replacement.length) return false;
+      for (; i < replacement.length; i++) {
+        replacement[i] = node.values[i + 1];
+      }
+      node.values = replacement;
+      size--;
+      return true;
+    }
     return false;
   }
 

src/test/java/org/bk/ass/query/PositionQueriesTest.java

@@ -8,6 +8,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.bk.ass.query.Distances.EUCLIDEAN_DISTANCE;
 
@@ -100,7 +101,7 @@ void shouldNotDieIfEmpty() {
     // GIVEN
     PositionQueries<Object> finder =
         new PositionQueries<>(
-            Collections.emptyList(),
+            emptyList(),
             o -> {
               throw new IllegalStateException("On what object are you calling me?");
             });
@@ -207,6 +208,18 @@ void shouldFindAllInRadiusOfUnit() {
     assertThat(result).hasSize(5);
   }
 
+  @Test
+  void shouldAddItem() {
+    // GIVEN
+    PositionQueries<Position> queries = new PositionQueries<>(emptyList(), Function.identity());
+
+    // WHEN
+    queries.add(new Position(0, 0));
+
+    // THEN
+    assertThat(queries).containsExactly(new Position(0, 0));
+  }
+
   @Test
   void shouldRemoveItem() {
     // GIVEN