Moved comparators into their relevant classes.

Author: Bytekeeper

src/main/java/bwem/Altitude.java

@@ -12,6 +12,10 @@
 
 package bwem;
 
+import bwapi.Pair;
+
+import java.util.Comparator;
+
 /**
  * Immutable wrapper of the integer primitive to satisfy the original C++ definition:
  * defs.h:54:typedef int16_t altitude_t;
@@ -21,6 +25,7 @@
 public final class Altitude implements Comparable<Altitude> {
     public static final Altitude UNINITIALIZED = new Altitude(-1);
     public static final Altitude ZERO = new Altitude(0);
+    public static final Comparator<Pair<?, Altitude>> BY_ALTITUDE_ORDER = Comparator.comparing(p -> p.getRight().intValue());
     private final int val;
 
     Altitude(final int val) {

src/main/java/bwem/BWMapInitializer.java

@@ -149,7 +149,7 @@ private List<Pair<WalkPosition, Altitude>> getSortedDeltasByAscendingAltitude(
             }
         }
 
-        deltasByAscendingAltitude.sort(new PairGenericAltitudeComparator<>());
+        deltasByAscendingAltitude.sort(Altitude.BY_ALTITUDE_ORDER);
 
         return deltasByAscendingAltitude;
     }
@@ -440,7 +440,7 @@ private List<Pair<WalkPosition, MiniTile>> getSortedMiniTilesByDescendingAltitud
                 }
             }
 
-        miniTilesByDescendingAltitude.sort(new PairGenericMiniTileAltitudeComparator<>());
+        miniTilesByDescendingAltitude.sort(MiniTile.BY_ALTITUDE_ORDER);
         Collections.reverse(miniTilesByDescendingAltitude);
 
         return miniTilesByDescendingAltitude;

src/main/java/bwem/MiniTile.java

@@ -12,8 +12,11 @@
 
 package bwem;
 
+import bwapi.Pair;
 import bwapi.WalkPosition;
 
+import java.util.Comparator;
+
 import static bwem.AreaId.UNINITIALIZED;
 
 /**
@@ -30,6 +33,7 @@
  */
 public final class MiniTile {
     private static final AreaId blockingCP = new AreaId(Integer.MIN_VALUE);
+    public static final Comparator<Pair<?, MiniTile>> BY_ALTITUDE_ORDER = Comparator.comparing(p -> p.getRight().getAltitude().intValue());
 
     private Altitude
             altitude; // 0 for seas  ;  != 0 for terrain and lakes (-1 = not computed yet)  ;  1 =