Replace LinkedHashSet with arrays and implement spliterator

Author: mbastian

src/main/java/org/gephi/graph/api/Rect2D.java

@@ -174,6 +174,44 @@ public boolean intersects(float minX, float minY, float maxX, float maxY) {
         return this.minX <= maxX && minX <= this.maxX && this.maxY >= minY && maxY >= this.minY;
     }
 
+    /**
+     * Returns true if this rectangle contains or intersects with the given
+     * rectangle. This is equivalent to checking
+     * {@code this.contains(rect) || this.intersects(rect)} but more efficient as it
+     * performs the check in a single operation.
+     *
+     * @param rect the rectangle to check
+     * @return true if this rectangle contains or intersects with the given
+     *         rectangle, false otherwise
+     */
+    public boolean containsOrIntersects(Rect2D rect) {
+        if (rect == this) {
+            return true;
+        }
+
+        return containsOrIntersects(rect.minX, rect.minY, rect.maxX, rect.maxY);
+    }
+
+    /**
+     * Returns true if this rectangle contains or intersects with the given
+     * rectangle. This is equivalent to checking
+     * {@code this.contains(minX, minY, maxX, maxY) || this.intersects(minX, minY, maxX, maxY)}
+     * but more efficient as it performs the check in a single operation.
+     *
+     * @param minX the x coordinate of the minimum corner
+     * @param minY the y coordinate of the minimum corner
+     * @param maxX the x coordinate of the maximum corner
+     * @param maxY the y coordinate of the maximum corner
+     *
+     * @return true if this rectangle contains or intersects with the given
+     *         rectangle, false otherwise
+     */
+    public boolean containsOrIntersects(float minX, float minY, float maxX, float maxY) {
+        // Two rectangles have overlap if they intersect - containment is a subset of
+        // intersection
+        return this.minX <= maxX && minX <= this.maxX && this.maxY >= minY && maxY >= this.minY;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {

src/main/java/org/gephi/graph/api/SpatialIndex.java

@@ -30,6 +30,17 @@ public interface SpatialIndex {
      */
     NodeIterable getNodesInArea(Rect2D rect);
 
+    /**
+     * Returns the nodes in the given area using a faster, but approximate method.
+     * <p>
+     * All nodes in the provided area are guaranteed to be returned, but some nodes
+     * outside the area may also be returned.
+     *
+     * @param rect area to query
+     * @return nodes in the area
+     */
+    NodeIterable getApproximateNodesInArea(Rect2D rect);
+
     /**
      * Returns the edges in the given area.
      *

src/main/java/org/gephi/graph/impl/GraphStoreConfiguration.java

@@ -85,6 +85,7 @@ public final class GraphStoreConfiguration {
     public static final int SPATIAL_INDEX_MAX_LEVELS = 16;
     public static final int SPATIAL_INDEX_MAX_OBJECTS_PER_NODE = 8192;
     public static final float SPATIAL_INDEX_DIMENSION_BOUNDARY = 1e6f;
+    public static final boolean SPATIAL_INDEX_APPROXIMATE_AREA_SEARCH = false;
     // Miscellaneous
     public static final double TIMESTAMP_STORE_GROWING_FACTOR = 1.1;
     public static final double INTERVAL_STORE_GROWING_FACTOR = 1.1;

src/main/java/org/gephi/graph/impl/GraphViewDecorator.java

@@ -876,6 +876,16 @@ public NodeIterable getNodesInArea(Rect2D rect) {
                 graphStore.spatialIndex.nodesTree.lock);
     }
 
+    @Override
+    public NodeIterable getApproximateNodesInArea(Rect2D rect) {
+        if (graphStore.spatialIndex == null) {
+            throw new UnsupportedOperationException("Spatial index is disabled (from Configuration)");
+        }
+        return new NodeIterableWrapper(
+                () -> new NodeViewIterator(graphStore.spatialIndex.getApproximateNodesInArea(rect).iterator()),
+                graphStore.spatialIndex.nodesTree.lock);
+    }
+
     @Override
     public EdgeIterable getEdgesInArea(Rect2D rect) {
         if (graphStore.spatialIndex == null) {