Changed Neighborhoods to return an immutable set, and map neighbors to return an UnsortedSetIterable.

Nathan Merrill · Nathan Merrill · commit 87dfbf3e8116 · 2017-02-28T23:32:56.000-07:00
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/generators/mazes/Ellers.java b/src/main/java/com/nmerrill/kothcomm/game/maps/generators/mazes/Ellers.java
@@ -70,7 +70,8 @@ private void connectSets(){
                 larger = currentSet;
             }
             larger.addAll(smaller);
-            smaller.forEach(i -> currentLine.set(i, adjacentSet));
+            smaller.forEach(i -> currentLine.set(i, larger));
+
         }
     }
 
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/generators/mazes/GrowingTree.java b/src/main/java/com/nmerrill/kothcomm/game/maps/generators/mazes/GrowingTree.java
@@ -1,7 +1,7 @@
 package com.nmerrill.kothcomm.game.maps.generators.mazes;
 
-import com.nmerrill.kothcomm.game.maps.generators.Generator;
 import com.nmerrill.kothcomm.game.maps.MapPoint;
+import com.nmerrill.kothcomm.game.maps.generators.Generator;
 import com.nmerrill.kothcomm.game.maps.graphmaps.GraphGraphMap;
 import com.nmerrill.kothcomm.utils.iterables.Itertools;
 import org.eclipse.collections.api.list.MutableList;
@@ -21,20 +21,20 @@ public static int selectOldest(MutableList<? extends MapPoint> points){
         return 0;
     }
     public static int selectNewest(MutableList<? extends MapPoint> points){
-        return points.size()-1;
-    }
-    public static <U extends MapPoint> ToIntFunction<MutableList<U>> randomSelection(){
-        return randomSelection(new Random());
-    }
-    public static <U extends MapPoint> ToIntFunction<MutableList<U>> randomSelection(Random random){
-        return (MutableList<U> list) -> random.nextInt(list.size());
-    }
+            return points.size()-1;
+        }
+        public static <U extends MapPoint> ToIntFunction<MutableList<U>> randomSelection(){
+            return randomSelection(new Random());
+        }
+        public static <U extends MapPoint> ToIntFunction<MutableList<U>> randomSelection(Random random){
+            return (MutableList<U> list) -> random.nextInt(list.size());
+        }
 
-    private final ToIntFunction<MutableList<U>> selectionMethod;
-    private final Random random;
+        private final ToIntFunction<MutableList<U>> selectionMethod;
+        private final Random random;
     public GrowingTree(ToIntFunction<MutableList<U>> selectionMethod, Random random){
-        this.selectionMethod = selectionMethod;
-        this.random = random;
+            this.selectionMethod = selectionMethod;
+            this.random = random;
     }
     public GrowingTree(ToIntFunction<MutableList<U>> selectionMethod){
         this(selectionMethod, new Random());
@@ -55,6 +55,7 @@ public void generate(GraphGraphMap<U, ?> map) {
         MutableList<U> visited = Lists.mutable.with();
         MutableSet<Twin<U>> connections = Sets.mutable.empty();
         visited.add(start);
+
         
         while (!borders.isEmpty()){
             U point = borders.remove(selectionMethod.applyAsInt(borders));
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/BijectiveGraphMap.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/BijectiveGraphMap.java
@@ -5,6 +5,7 @@
 import com.nmerrill.kothcomm.game.maps.MapPoint;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.UnsortedSetIterable;
 
 
 public class BijectiveGraphMap<U extends MapPoint, T, V extends MapPoint, W>
@@ -22,7 +23,7 @@ public boolean isEmpty(U point) {
     }
 
     @Override
-    public MutableSet<U> getNeighbors(U origin) {
+    public UnsortedSetIterable<U> getNeighbors(U origin) {
         return map.getNeighbors(key.to(origin)).collect(key::from);
     }
 
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/GraphMap.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/GraphMap.java
@@ -9,6 +9,7 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.UnsortedSetIterable;
 import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.impl.factory.Maps;
 import org.eclipse.collections.impl.factory.Sets;
@@ -17,9 +18,9 @@
 
 public interface GraphMap<U extends MapPoint, T> extends GameMap<U, T>, Iterable<U> {
 
-    MutableSet<U> getNeighbors(U origin);
+    UnsortedSetIterable<U> getNeighbors(U origin);
 
-    static <U> MutableSet<U> getNeighbors(U origin, int maxDistance, Function<U, ? extends Collection<U>> neighborFunction){
+    static <U> MutableSet<U> getNeighbors(U origin, int maxDistance, Function<U, ? extends Iterable<U>> neighborFunction){
         MutableSet<U> points = Sets.mutable.empty();
         points.add(origin);
         MutableSet<U> borders = points.clone();
@@ -34,7 +35,7 @@ static <U> MutableSet<U> getNeighbors(U origin, int maxDistance, Function<U, ? e
         return points;
     }
 
-    default MutableSet<U> getNeighbors(U origin, int maxDistance){
+    default UnsortedSetIterable<U> getNeighbors(U origin, int maxDistance){
         return getNeighbors(origin, maxDistance, this::getNeighbors);
     }
 
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/GraphMapView.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/GraphMapView.java
@@ -7,6 +7,7 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.UnsortedSetIterable;
 import org.eclipse.collections.api.tuple.Pair;
 import org.eclipse.collections.impl.factory.Lists;
 
@@ -23,12 +24,12 @@ public GraphMapView(GraphMap<U, T> map, Region<U> region){
         this.map = map;
     }
 
-    public MutableSet<U> getNeighbors(U origin){
+    public UnsortedSetIterable<U> getNeighbors(U origin){
         region.checkBounds(origin);
         return map.getNeighbors(origin).select(region::inBounds);
     }
 
-    public MutableSet<U> getNeighbors(U origin, int maxDistance){
+    public UnsortedSetIterable<U> getNeighbors(U origin, int maxDistance){
         region.checkBounds(origin);
         return map.getNeighbors(origin, maxDistance).select(region::inBounds);
     }
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/NeighborhoodGraphMap.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/NeighborhoodGraphMap.java
@@ -1,10 +1,11 @@
 package com.nmerrill.kothcomm.game.maps.graphmaps;
 
-import com.nmerrill.kothcomm.game.maps.graphmaps.bounds.Region;
 import com.nmerrill.kothcomm.game.maps.MapPoint;
+import com.nmerrill.kothcomm.game.maps.graphmaps.bounds.Region;
 import com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods.Neighborhood;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.api.set.MutableSet;
 import org.eclipse.collections.impl.factory.Maps;
 
@@ -29,7 +30,7 @@ public boolean isEmpty(U point) {
     }
 
     @Override
-    public MutableSet<U> getNeighbors(U origin) {
+    public ImmutableSet<U> getNeighbors(U origin) {
         region.checkBounds(origin);
         return neighborhood.getAdjacencies(origin).select(region::inBounds);
     }
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/ReadonlyGraphMap.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/ReadonlyGraphMap.java
@@ -6,6 +6,7 @@
 import com.nmerrill.kothcomm.game.maps.graphmaps.bounds.Region;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.UnsortedSetIterable;
 
 public class ReadonlyGraphMap<U extends MapPoint, T> extends ReadonlyGameMap<U, T>{
     private final GraphMap<U, T> map;
@@ -14,11 +15,11 @@ public ReadonlyGraphMap(GraphMap<U, T> map){
         this.map = map;
     }
 
-    public MutableSet<U> getNeighbors(U origin){
+    public UnsortedSetIterable<U> getNeighbors(U origin){
         return map.getNeighbors(origin);
     }
 
-    public MutableSet<U> getNeighbors(U origin, int maxDistance){
+    public UnsortedSetIterable<U> getNeighbors(U origin, int maxDistance){
         return map.getNeighbors(origin, maxDistance);
     }
 
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/HexagonalNeighborhood.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/HexagonalNeighborhood.java
@@ -1,14 +1,14 @@
 package com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods;
 
 import com.nmerrill.kothcomm.game.maps.Point2D;
-import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.impl.factory.Sets;
 
 public final class HexagonalNeighborhood implements Neighborhood<Point2D> {
 
     @Override
-    public MutableSet<Point2D> getAdjacencies(Point2D point) {
-        return Sets.mutable.of(
+    public ImmutableSet<Point2D> getAdjacencies(Point2D point) {
+        return Sets.immutable.of(
                 point.move(-1, -1),
                 point.move(-1, 0),
                 point.move(0, -1),
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/MooreNeighborhood.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/MooreNeighborhood.java
@@ -1,13 +1,13 @@
 package com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods;
 
 import com.nmerrill.kothcomm.game.maps.Point2D;
-import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.impl.factory.Sets;
 
 public final class MooreNeighborhood implements Neighborhood<Point2D> {
     @Override
-    public MutableSet<Point2D> getAdjacencies(Point2D point) {
-        return Sets.mutable.of(
+    public ImmutableSet<Point2D> getAdjacencies(Point2D point) {
+        return Sets.immutable.of(
                 point.move(-1, -1),
                 point.move(-1, 0),
                 point.move(-1, 1),
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/Neighborhood.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/Neighborhood.java
@@ -1,9 +1,9 @@
 package com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods;
 
 import com.nmerrill.kothcomm.game.maps.MapPoint;
-import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.ImmutableSet;
 
 
 public interface Neighborhood<U extends MapPoint> {
-    MutableSet<U> getAdjacencies(U point);
+    ImmutableSet<U> getAdjacencies(U point);
 }
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/TriangleNeighborhood.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/TriangleNeighborhood.java
@@ -1,15 +1,15 @@
 package com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods;
 
 import com.nmerrill.kothcomm.game.maps.Point2D;
-import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.impl.factory.Sets;
 
 
 public final class TriangleNeighborhood implements Neighborhood<Point2D> {
     @Override
-    public MutableSet<Point2D> getAdjacencies(Point2D point) {
+    public ImmutableSet<Point2D> getAdjacencies(Point2D point) {
         boolean pointUp = (point.getX()+point.getY())%2 == 0;
-        return Sets.mutable.of(
+        return Sets.immutable.of(
                 point.move(-1, 0),
                 point.move(0, pointUp?-1:1),
                 point.move(1, 0)
diff --git a/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/VonNeumannNeighborhood.java b/src/main/java/com/nmerrill/kothcomm/game/maps/graphmaps/neighborhoods/VonNeumannNeighborhood.java
@@ -1,14 +1,14 @@
 package com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods;
 
 import com.nmerrill.kothcomm.game.maps.Point2D;
-import org.eclipse.collections.api.set.MutableSet;
+import org.eclipse.collections.api.set.ImmutableSet;
 import org.eclipse.collections.impl.factory.Sets;
 
 public final class VonNeumannNeighborhood implements Neighborhood<Point2D> {
 
     @Override
-    public MutableSet<Point2D> getAdjacencies(Point2D point) {
-        return Sets.mutable.of(
+    public ImmutableSet<Point2D> getAdjacencies(Point2D point) {
+        return Sets.immutable.of(
                 point.move(-1, 0),
                 point.move(0, -1),
                 point.move(0, 1),

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ private void connectSets(){`
`70`	`70`	`larger = currentSet;`
`71`	`71`	`}`
`72`	`72`	`larger.addAll(smaller);`
`73`		`- smaller.forEach(i -> currentLine.set(i, adjacentSet));`
	`73`	`+ smaller.forEach(i -> currentLine.set(i, larger));`
	`74`	`+`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import com.nmerrill.kothcomm.game.maps.MapPoint;`
`6`	`6`	`import org.eclipse.collections.api.list.MutableList;`
`7`	`7`	`import org.eclipse.collections.api.set.MutableSet;`
	`8`	`+import org.eclipse.collections.api.set.UnsortedSetIterable;`
`8`	`9`
`9`	`10`
`10`	`11`	`public class BijectiveGraphMap<U extends MapPoint, T, V extends MapPoint, W>`
`@@ -22,7 +23,7 @@ public boolean isEmpty(U point) {`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`@Override`
`25`		`- public MutableSet<U> getNeighbors(U origin) {`
	`26`	`+ public UnsortedSetIterable<U> getNeighbors(U origin) {`
`26`	`27`	`return map.getNeighbors(key.to(origin)).collect(key::from);`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import org.eclipse.collections.api.list.MutableList;`
`8`	`8`	`import org.eclipse.collections.api.map.MutableMap;`
`9`	`9`	`import org.eclipse.collections.api.set.MutableSet;`
	`10`	`+import org.eclipse.collections.api.set.UnsortedSetIterable;`
`10`	`11`	`import org.eclipse.collections.api.tuple.Pair;`
`11`	`12`	`import org.eclipse.collections.impl.factory.Lists;`
`12`	`13`
`@@ -23,12 +24,12 @@ public GraphMapView(GraphMap<U, T> map, Region<U> region){`
`23`	`24`	`this.map = map;`
`24`	`25`	`}`
`25`	`26`
`26`		`- public MutableSet<U> getNeighbors(U origin){`
	`27`	`+ public UnsortedSetIterable<U> getNeighbors(U origin){`
`27`	`28`	`region.checkBounds(origin);`
`28`	`29`	`return map.getNeighbors(origin).select(region::inBounds);`
`29`	`30`	`}`
`30`	`31`
`31`		`- public MutableSet<U> getNeighbors(U origin, int maxDistance){`
	`32`	`+ public UnsortedSetIterable<U> getNeighbors(U origin, int maxDistance){`
`32`	`33`	`region.checkBounds(origin);`
`33`	`34`	`return map.getNeighbors(origin, maxDistance).select(region::inBounds);`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import com.nmerrill.kothcomm.game.maps.graphmaps.bounds.Region;`
`7`	`7`	`import org.eclipse.collections.api.list.MutableList;`
`8`	`8`	`import org.eclipse.collections.api.set.MutableSet;`
	`9`	`+import org.eclipse.collections.api.set.UnsortedSetIterable;`
`9`	`10`
`10`	`11`	`public class ReadonlyGraphMap<U extends MapPoint, T> extends ReadonlyGameMap<U, T>{`
`11`	`12`	`private final GraphMap<U, T> map;`
`@@ -14,11 +15,11 @@ public ReadonlyGraphMap(GraphMap<U, T> map){`
`14`	`15`	`this.map = map;`
`15`	`16`	`}`
`16`	`17`
`17`		`- public MutableSet<U> getNeighbors(U origin){`
	`18`	`+ public UnsortedSetIterable<U> getNeighbors(U origin){`
`18`	`19`	`return map.getNeighbors(origin);`
`19`	`20`	`}`
`20`	`21`
`21`		`- public MutableSet<U> getNeighbors(U origin, int maxDistance){`
	`22`	`+ public UnsortedSetIterable<U> getNeighbors(U origin, int maxDistance){`
`22`	`23`	`return map.getNeighbors(origin, maxDistance);`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package com.nmerrill.kothcomm.game.maps.graphmaps.neighborhoods;`
`2`	`2`
`3`	`3`	`import com.nmerrill.kothcomm.game.maps.MapPoint;`
`4`		`-import org.eclipse.collections.api.set.MutableSet;`
	`4`	`+import org.eclipse.collections.api.set.ImmutableSet;`
`5`	`5`
`6`	`6`
`7`	`7`	`public interface Neighborhood<U extends MapPoint> {`
`8`		`- MutableSet<U> getAdjacencies(U point);`
	`8`	`+ ImmutableSet<U> getAdjacencies(U point);`
`9`	`9`	`}`