You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rw...@apache.org on 2003/12/01 06:16:24 UTC
cvs commit: jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/example QuicksortExample.java
rwaldhoff 2003/11/30 21:16:24
Modified: functor/src/test/org/apache/commons/functor/core/comparator
TestIsNotEquivalent.java TestIsLessThan.java
TestIsLessThanOrEqual.java
functor/src/java/org/apache/commons/functor/core/comparator
IsGreaterThan.java IsNotEquivalent.java
IsLessThan.java IsEquivalent.java
IsLessThanOrEqual.java IsGreaterThanOrEqual.java
functor/src/test/org/apache/commons/functor/example
QuicksortExample.java
Log:
* rename singleton accessor methods to instance()
* add instance(Comparable) method
Revision Changes Path
1.4 +4 -4 jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java
Index: TestIsNotEquivalent.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/comparator/TestIsNotEquivalent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestIsNotEquivalent.java 4 Mar 2003 23:05:25 -0000 1.3
+++ TestIsNotEquivalent.java 1 Dec 2003 05:16:24 -0000 1.4
@@ -115,8 +115,8 @@
assertObjectsAreEqual(p,new IsNotEquivalent());
assertObjectsAreEqual(p,new IsNotEquivalent(null));
assertObjectsAreEqual(p,new IsNotEquivalent(new ComparableComparator()));
- assertObjectsAreEqual(p,IsNotEquivalent.getIsNotEquivalent());
- assertSame(IsNotEquivalent.getIsNotEquivalent(),IsNotEquivalent.getIsNotEquivalent());
+ assertObjectsAreEqual(p,IsNotEquivalent.instance());
+ assertSame(IsNotEquivalent.instance(),IsNotEquivalent.instance());
assertObjectsAreNotEqual(p,new ConstantPredicate(false));
}
1.4 +4 -4 jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/comparator/TestIsLessThan.java
Index: TestIsLessThan.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/comparator/TestIsLessThan.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestIsLessThan.java 4 Mar 2003 23:11:13 -0000 1.3
+++ TestIsLessThan.java 1 Dec 2003 05:16:24 -0000 1.4
@@ -115,8 +115,8 @@
assertObjectsAreEqual(p,new IsLessThan());
assertObjectsAreEqual(p,new IsLessThan(null));
assertObjectsAreEqual(p,new IsLessThan(new ComparableComparator()));
- assertObjectsAreEqual(p,IsLessThan.getIsLessThan());
- assertSame(IsLessThan.getIsLessThan(),IsLessThan.getIsLessThan());
+ assertObjectsAreEqual(p,IsLessThan.instance());
+ assertSame(IsLessThan.instance(),IsLessThan.instance());
assertObjectsAreNotEqual(p,new ConstantPredicate(false));
}
1.4 +4 -4 jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java
Index: TestIsLessThanOrEqual.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/comparator/TestIsLessThanOrEqual.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestIsLessThanOrEqual.java 4 Mar 2003 23:11:13 -0000 1.3
+++ TestIsLessThanOrEqual.java 1 Dec 2003 05:16:24 -0000 1.4
@@ -115,8 +115,8 @@
assertObjectsAreEqual(p,new IsLessThanOrEqual());
assertObjectsAreEqual(p,new IsLessThanOrEqual(null));
assertObjectsAreEqual(p,new IsLessThanOrEqual(new ComparableComparator()));
- assertObjectsAreEqual(p,IsLessThanOrEqual.getIsLessThanOrEqual());
- assertSame(IsLessThanOrEqual.getIsLessThanOrEqual(),IsLessThanOrEqual.getIsLessThanOrEqual());
+ assertObjectsAreEqual(p,IsLessThanOrEqual.instance());
+ assertSame(IsLessThanOrEqual.instance(),IsLessThanOrEqual.instance());
assertObjectsAreNotEqual(p,new ConstantPredicate(false));
}
1.5 +8 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
Index: IsGreaterThan.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IsGreaterThan.java 24 Nov 2003 20:12:17 -0000 1.4
+++ IsGreaterThan.java 1 Dec 2003 05:16:24 -0000 1.5
@@ -60,6 +60,8 @@
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
+import org.apache.commons.functor.UnaryPredicate;
+import org.apache.commons.functor.adapter.RightBoundPredicate;
/**
* A {@link BinaryPredicate BinaryPredicate} that {@link #test tests}
@@ -141,6 +143,10 @@
return COMPARABLE_INSTANCE;
}
+ public static final UnaryPredicate instance(Comparable right) {
+ return RightBoundPredicate.bind(instance(),right);
+ }
+
private Comparator comparator = null;
private static final IsGreaterThan COMPARABLE_INSTANCE = new IsGreaterThan();
}
1.5 +9 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
Index: IsNotEquivalent.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IsNotEquivalent.java 24 Nov 2003 20:12:17 -0000 1.4
+++ IsNotEquivalent.java 1 Dec 2003 05:16:24 -0000 1.5
@@ -60,6 +60,8 @@
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
+import org.apache.commons.functor.UnaryPredicate;
+import org.apache.commons.functor.adapter.RightBoundPredicate;
/**
* A {@link BinaryPredicate BinaryPredicate} that {@link #test tests}
@@ -140,8 +142,12 @@
return "IsNotEquivalent<" + comparator + ">";
}
- public static final IsNotEquivalent getIsNotEquivalent() {
+ public static final IsNotEquivalent instance() {
return COMPARABLE_INSTANCE;
+ }
+
+ public static final UnaryPredicate instance(Comparable right) {
+ return RightBoundPredicate.bind(instance(),right);
}
private Comparator comparator = null;
1.5 +9 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsLessThan.java
Index: IsLessThan.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsLessThan.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IsLessThan.java 24 Nov 2003 20:12:17 -0000 1.4
+++ IsLessThan.java 1 Dec 2003 05:16:24 -0000 1.5
@@ -60,6 +60,8 @@
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
+import org.apache.commons.functor.UnaryPredicate;
+import org.apache.commons.functor.adapter.RightBoundPredicate;
/**
* A {@link BinaryPredicate BinaryPredicate} that {@link #test tests}
@@ -137,8 +139,12 @@
return "IsLessThan<" + comparator + ">";
}
- public static final IsLessThan getIsLessThan() {
+ public static final IsLessThan instance() {
return COMPARABLE_INSTANCE;
+ }
+
+ public static final UnaryPredicate instance(Comparable right) {
+ return RightBoundPredicate.bind(instance(),right);
}
private Comparator comparator = null;
1.5 +8 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
Index: IsEquivalent.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsEquivalent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IsEquivalent.java 24 Nov 2003 20:12:17 -0000 1.4
+++ IsEquivalent.java 1 Dec 2003 05:16:24 -0000 1.5
@@ -60,6 +60,8 @@
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
+import org.apache.commons.functor.UnaryPredicate;
+import org.apache.commons.functor.adapter.RightBoundPredicate;
/**
* A {@link BinaryPredicate BinaryPredicate} that {@link #test tests}
@@ -142,6 +144,10 @@
public static final IsEquivalent instance() {
return COMPARABLE_INSTANCE;
+ }
+
+ public static final UnaryPredicate instance(Comparable right) {
+ return RightBoundPredicate.bind(instance(),right);
}
private Comparator comparator = null;
1.5 +9 -3 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
Index: IsLessThanOrEqual.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IsLessThanOrEqual.java 24 Nov 2003 20:12:17 -0000 1.4
+++ IsLessThanOrEqual.java 1 Dec 2003 05:16:24 -0000 1.5
@@ -60,6 +60,8 @@
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
+import org.apache.commons.functor.UnaryPredicate;
+import org.apache.commons.functor.adapter.RightBoundPredicate;
/**
* A {@link BinaryPredicate BinaryPredicate} that {@link #test tests}
@@ -137,8 +139,12 @@
return "IsLessThanOrEqual<" + comparator + ">";
}
- public static final IsLessThanOrEqual getIsLessThanOrEqual() {
+ public static final IsLessThanOrEqual instance() {
return COMPARABLE_INSTANCE;
+ }
+
+ public static final UnaryPredicate instance(Comparable right) {
+ return RightBoundPredicate.bind(instance(),right);
}
private Comparator comparator = null;
1.5 +8 -2 jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
Index: IsGreaterThanOrEqual.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IsGreaterThanOrEqual.java 24 Nov 2003 20:12:17 -0000 1.4
+++ IsGreaterThanOrEqual.java 1 Dec 2003 05:16:24 -0000 1.5
@@ -60,6 +60,8 @@
import java.util.Comparator;
import org.apache.commons.functor.BinaryPredicate;
+import org.apache.commons.functor.UnaryPredicate;
+import org.apache.commons.functor.adapter.RightBoundPredicate;
/**
* A {@link BinaryPredicate BinaryPredicate} that {@link #test tests}
@@ -141,6 +143,10 @@
return COMPARABLE_INSTANCE;
}
+ public static final UnaryPredicate instance(Comparable right) {
+ return RightBoundPredicate.bind(instance(),right);
+ }
+
private Comparator comparator = null;
private static final IsGreaterThanOrEqual COMPARABLE_INSTANCE = new IsGreaterThanOrEqual();
}
1.8 +7 -12 jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/example/QuicksortExample.java
Index: QuicksortExample.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/example/QuicksortExample.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- QuicksortExample.java 25 Nov 2003 19:39:45 -0000 1.7
+++ QuicksortExample.java 1 Dec 2003 05:16:24 -0000 1.8
@@ -68,7 +68,6 @@
import org.apache.commons.functor.Algorithms;
import org.apache.commons.functor.BinaryFunction;
import org.apache.commons.functor.UnaryFunction;
-import org.apache.commons.functor.adapter.RightBoundPredicate;
import org.apache.commons.functor.core.ConstantFunction;
import org.apache.commons.functor.core.collection.IsEmpty;
import org.apache.commons.functor.core.comparator.IsGreaterThanOrEqual;
@@ -503,9 +502,7 @@
public Object evaluate(Object head, List tail) {
return Algorithms.collect(Algorithms.select(
tail.iterator(),
- RightBoundPredicate.bind(
- IsLessThan.getIsLessThan(),
- head)));
+ IsLessThan.instance((Comparable)head)));
}
};
@@ -514,13 +511,11 @@
* the tail greater than (or equal to) the head. This
* is similar to the lesserTail approach.
*/
- private BinaryFunction greaterTail = new BinaryFunction() {
- public Object evaluate(Object head, Object tail) {
+ private BinaryFunction greaterTail = new ObjectListFunction() {
+ public Object evaluate(Object head, List tail) {
return Algorithms.collect(Algorithms.select(
- ((List)tail).iterator(),
- RightBoundPredicate.bind(
- IsGreaterThanOrEqual.instance(),
- head)));
+ tail.iterator(),
+ IsGreaterThanOrEqual.instance((Comparable)head)));
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org