binary predicate expressions for equals (and not equals)

Author: kaifox

src/examples/org/tensorics/core/examples/meteo/icalepcs17/City.java

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved.
+ */
+
+package org.tensorics.core.examples.meteo.icalepcs17;
+
+public class City {
+
+    public static City ofName(String name) {
+        return null;
+    }
+
+}

src/examples/org/tensorics/core/examples/meteo/icalepcs17/Constants.java

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved.
+ */
+
+package org.tensorics.core.examples.meteo.icalepcs17;
+
+public class Constants {
+
+    public static final City SF = City.ofName("San Francisco");
+    public static final City LA = City.ofName("Los Angeles");
+
+    public static final Time T1 = Time.of("2017-01-01 15:00");
+    public static final Time T2 = Time.of("2017-01-02 15:00");
+
+}

src/examples/org/tensorics/core/examples/meteo/icalepcs17/Time.java

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved.
+ */
+
+package org.tensorics.core.examples.meteo.icalepcs17;
+
+public class Time {
+
+    public static Time of(String time) {
+        return null;
+    }
+
+}

src/java/org/tensorics/core/lang/OngoingBasicDeferredBinaryPredicate.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved.
+ */
+
+package org.tensorics.core.lang;
+
+import org.tensorics.core.expressions.BinaryPredicateExpression;
+import org.tensorics.core.math.predicates.IsEqualTo;
+import org.tensorics.core.math.predicates.IsNotEqualTo;
+import org.tensorics.core.tree.domain.Expression;
+import org.tensorics.core.tree.domain.ResolvedExpression;
+
+public class OngoingBasicDeferredBinaryPredicate<T> {
+
+    private final Expression<T> left;
+
+    public OngoingBasicDeferredBinaryPredicate(Expression<T> left) {
+        this.left = left;
+    }
+
+    public Expression<Boolean> isEqualTo(Expression<T> right) {
+        return new BinaryPredicateExpression<>(IsEqualTo.isEqualTo(), left, right);
+    }
+
+    public Expression<Boolean> isEqualTo(T right) {
+        return isEqualTo(ResolvedExpression.of(right));
+    }
+
+    public Expression<Boolean> isNotEqualTo(Expression<T> right) {
+        return new BinaryPredicateExpression<>(IsNotEqualTo.isNotEqualTo(), left, right);
+    }
+
+    public Expression<Boolean> isNotEqualTo(T right) {
+        return isNotEqualTo(ResolvedExpression.of(right));
+    }
+
+}

src/java/org/tensorics/core/lang/TensoricExpressions.java

@@ -22,6 +22,7 @@
 import org.tensorics.core.functional.FuncN;
 import org.tensorics.core.functional.expressions.FunctionalExpression;
 import org.tensorics.core.tree.domain.Expression;
+import org.tensorics.core.tree.domain.ResolvedExpression;
 
 import com.google.common.collect.ImmutableList;
 
@@ -106,4 +107,12 @@ public static <T> Expression<T> lastOf(Expression<? extends Iterable<T>> source)
         return LatestOfExpression.latestOf(source);
     }
 
+    public static <T> OngoingBasicDeferredBinaryPredicate<T> testIf(Expression<T> left) {
+        return new OngoingBasicDeferredBinaryPredicate<>(left);
+    }
+
+    public static <T> OngoingBasicDeferredBinaryPredicate<T> testIf(T left) {
+        return testIf(ResolvedExpression.of(left));
+    }
+
 }

src/java/org/tensorics/core/math/predicates/IsEqualTo.java

@@ -6,6 +6,8 @@
 
 public final class IsEqualTo<T> implements BinaryPredicate<T> {
 
+    private static final IsEqualTo<?> INSTANCE = new IsEqualTo<>();
+
     @Override
     public Boolean perform(T left, T right) {
         return test(left, right);
@@ -16,4 +18,9 @@ public boolean test(T left, T right) {
         return left.equals(right);
     }
 
+    @SuppressWarnings("unchecked")
+    public static final <T> IsEqualTo<T> isEqualTo() {
+        return (IsEqualTo<T>) INSTANCE;
+    }
+
 }

src/java/org/tensorics/core/math/predicates/IsNotEqualTo.java

@@ -6,6 +6,8 @@
 
 public class IsNotEqualTo<T> implements BinaryPredicate<T> {
 
+    private static final IsNotEqualTo<?> INSTANCE = new IsNotEqualTo<>();
+
     @Override
     public Boolean perform(T left, T right) {
         return test(left, right);
@@ -15,4 +17,9 @@ public Boolean perform(T left, T right) {
     public boolean test(T left, T right) {
         return !left.equals(right);
     }
+
+    @SuppressWarnings("unchecked")
+    public static final <T> IsNotEqualTo<T> isNotEqualTo() {
+        return (IsNotEqualTo<T>) INSTANCE;
+    }
 }

src/java/org/tensorics/core/tensor/lang/OngoingDimensionReduction.java

@@ -2,7 +2,7 @@
  /*******************************************************************************
  *
  * This file is part of tensorics.
- * 
+ *
  * Copyright (c) 2008-2011, CERN. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  * 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.
- * 
+ *
  ******************************************************************************/
 // @formatter:on
 
@@ -30,11 +30,12 @@
 /**
  * Part of the tensorics fluent API, that allows to further describe how a tensor dimesion shall be reduced (where the
  * field was not yet known in the previous expression part)
- * 
+ *
  * @author kfuchsbe
  * @param <C> the type of the dimension in which the tensor shall be reduced
  * @param <S> the type of the scalars (elements of the field on which all the operations are based on)
  */
+@Deprecated
 public final class OngoingDimensionReduction<C, S> extends OngoingStructuralReduction<C, S> {
 
     public OngoingDimensionReduction(Tensor<S> tensor, Class<C> dimension) {

src/java/org/tensorics/core/tensor/lang/OngoingFieldAwareTensorReduction.java

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2017 European Organisation for Nuclear Research (CERN), All Rights Reserved.
+ */
+
+package org.tensorics.core.tensor.lang;
+
+import static java.util.Objects.requireNonNull;
+
+import org.tensorics.core.commons.options.Environment;
+
+public class OngoingFieldAwareTensorReduction<V> extends OngoingTensorReduction<V> {
+
+    private final Environment<V> environment;
+
+    public OngoingFieldAwareTensorReduction(Environment<V> environment) {
+        this.environment = requireNonNull(environment, "environment must not be null");
+    }
+
+}

src/java/org/tensorics/core/tensor/lang/OngoingStructuralReduction.java

@@ -2,7 +2,7 @@
  /*******************************************************************************
  *
  * This file is part of tensorics.
- * 
+ *
  * Copyright (c) 2008-2011, CERN. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
  * 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.
- * 
+ *
  ******************************************************************************/
 // @formatter:on
 
@@ -30,12 +30,13 @@
 /**
  * Part of the tensoric fluent API, which provides methods to specify concretely how a given dimension should be
  * reduced.
- * 
+ *
  * @author kfuchsbe
  * @param <C> the type of coordinate (aka 'the dimension') which is going to be reduced (by calling methods of this
  *            class)
  * @param <E> the type of the elements of the tensor to be reduced.
  */
+@Deprecated
 public class OngoingStructuralReduction<C, E> {
 
     private final Tensor<E> tensor;