Added Ord.isLessThanOrEqualTo to Ord

mperry · mperry · commit fc9f9bd0a5b7 · 2016-06-18T23:07:56.000+10:00
diff --git a/core/src/main/java/fj/Ord.java b/core/src/main/java/fj/Ord.java
@@ -92,6 +92,19 @@ public boolean isLessThan(final A a1, final A a2) {
     return compare(a1, a2) == Ordering.LT;
   }
 
+    /**
+     * Returns <code>true</code> if the first given argument is less than or equal to the second given argument,
+     * <code>false</code> otherwise.
+     *
+     * @param a1 An instance to compare for ordering to another.
+     * @param a2 An instance to compare for ordering to another.
+     * @return <code>true</code> if the first given argument is less than or equal to the second given argument,
+     *         <code>false</code> otherwise.
+     */
+    public boolean isLessThanOrEqualTo(final A a1, final A a2) {
+        return isLessThan(a1, a2) || eq(a1, a2);
+    }
+
   /**
    * Returns <code>true</code> if the first given argument is greater than the second given
    * argument, <code>false</code> otherwise.
diff --git a/core/src/main/java/fj/data/List.java b/core/src/main/java/fj/data/List.java
@@ -962,7 +962,7 @@ List<A> merge(List<A> xs, List<A> ys, final Ord<A> o) {
             final A x = xs.head();
             final A y = ys.head();
 
-            if (o.isLessThan(x, y) || o.eq(x, y)) {
+            if (o.isLessThanOrEqualTo(x, y)) {
               buf.snoc(x);
               xs = xs.tail();
             } else {
