ValueComparator uses ascending flag, tests

stratosphere-java/src/main/java/eu/stratosphere/api/java/typeutils/runtime/CopyableValueComparator.java

@@ -64,12 +64,14 @@ public class CopyableValueComparator<T extends CopyableValue<T> & Comparable<T>>
 	@Override
 	public int compareToReference(TypeComparator<T> referencedComparator) {
 		T otherRef = ((CopyableValueComparator<T>) referencedComparator).reference;
-		return otherRef.compareTo(reference);
+		int comp = otherRef.compareTo(reference);
+		return ascendingComparison ? comp : -comp;
 	}
 	
 	@Override
 	public int compare(T first, T second) {
-		return first.compareTo(second);
+		int comp = first.compareTo(second);
+		return ascendingComparison ? comp : -comp;
 	}
 	
 	@Override
@@ -80,7 +82,8 @@ public class CopyableValueComparator<T extends CopyableValue<T> & Comparable<T>>
 		
 		reference.read(firstSource);
 		tempReference.read(secondSource);
-		return reference.compareTo(tempReference);
+		int comp = reference.compareTo(tempReference);
+		return ascendingComparison ? comp : -comp;
 	}
 
 	@Override

stratosphere-java/src/main/java/eu/stratosphere/api/java/typeutils/runtime/ValueComparator.java

@@ -68,12 +68,14 @@ public class ValueComparator<T extends Value & Comparable<T>> extends TypeCompar
 	@Override
 	public int compareToReference(TypeComparator<T> referencedComparator) {
 		T otherRef = ((ValueComparator<T>) referencedComparator).reference;
-		return otherRef.compareTo(reference);
+		int comp = otherRef.compareTo(reference);
+		return ascendingComparison ? comp : -comp;
 	}
 	
 	@Override
 	public int compare(T first, T second) {
-		return first.compareTo(second);
+		int comp = first.compareTo(second);
+		return ascendingComparison ? comp : -comp;
 	}
 	
 	@Override
@@ -87,7 +89,8 @@ public class ValueComparator<T extends Value & Comparable<T>> extends TypeCompar
 		
 		reference.read(firstSource);
 		tempReference.read(secondSource);
-		return reference.compareTo(tempReference);
+		int comp = reference.compareTo(tempReference);
+		return ascendingComparison ? comp : -comp;
 	}
 
 	@Override

stratosphere-java/src/test/java/eu/stratosphere/api/java/typeutils/runtime/CopyableValueComparatorTest.java

+/***********************************************************************************************************************
+ *
+ * Copyright (C) 2010-2013 by the Stratosphere project (http://stratosphere.eu)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ **********************************************************************************************************************/
+package eu.stratosphere.api.java.typeutils.runtime;
+
+import eu.stratosphere.api.common.typeutils.ComparatorTestBase;
+import eu.stratosphere.api.common.typeutils.TypeComparator;
+import eu.stratosphere.api.common.typeutils.TypeSerializer;
+import eu.stratosphere.types.StringValue;
+
+public class CopyableValueComparatorTest extends ComparatorTestBase<StringValue> {
+
+	StringValue[] data = new StringValue[]{
+		new StringValue(""),
+		new StringValue("Lorem Ipsum Dolor Omit Longer"),
+		new StringValue("aaaa"),
+		new StringValue("abcd"),
+		new StringValue("abce"),
+		new StringValue("abdd"),
+		new StringValue("accd"),
+		new StringValue("bbcd")
+	};
+
+	@Override
+	protected TypeComparator<StringValue> createComparator(boolean ascending) {
+		return new CopyableValueComparator(ascending, StringValue.class);
+	}
+
+	@Override
+	protected TypeSerializer<StringValue> createSerializer() {
+		return new CopyableValueSerializer(StringValue.class);
+	}
+
+	@Override
+	protected StringValue[] getSortedTestData() {
+		return data;
+	}
+}

stratosphere-java/src/test/java/eu/stratosphere/api/java/typeutils/runtime/ValueComparatorTest.java

+/***********************************************************************************************************************
+ *
+ * Copyright (C) 2010-2013 by the Stratosphere project (http://stratosphere.eu)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ **********************************************************************************************************************/
+package eu.stratosphere.api.java.typeutils.runtime;
+
+import eu.stratosphere.api.common.typeutils.ComparatorTestBase;
+import eu.stratosphere.api.common.typeutils.TypeComparator;
+import eu.stratosphere.api.common.typeutils.TypeSerializer;
+import eu.stratosphere.api.common.typeutils.base.StringValueSerializer;
+import eu.stratosphere.types.StringValue;
+import eu.stratosphere.types.Value;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+public class ValueComparatorTest extends ComparatorTestBase<StringValue> {
+
+	StringValue[] data = new StringValue[]{
+		new StringValue(""),
+		new StringValue("Lorem Ipsum Dolor Omit Longer"),
+		new StringValue("aaaa"),
+		new StringValue("abcd"),
+		new StringValue("abce"),
+		new StringValue("abdd"),
+		new StringValue("accd"),
+		new StringValue("bbcd")
+	};
+
+	@Override
+	protected TypeComparator<StringValue> createComparator(boolean ascending) {
+		return new ValueComparator(ascending, StringValue.class);
+	}
+
+	@Override
+	protected TypeSerializer<StringValue> createSerializer() {
+		return new ValueSerializer(StringValue.class);
+	}
+
+	@Override
+	protected StringValue[] getSortedTestData() {
+		return data;
+	}
+}