support for date/time comparisons

client-java/distance-heuristics/src/main/java/org/evomaster/client/java/distance/heuristics/TruthnessUtils.java

@@ -72,8 +72,8 @@ public static Truthness getEqualityTruthness(double a, double b) {
         );
     }
 
-
     /**
+     * Returns a truthness value for comparing how close a length was to 0.
      * @param len a positive value for a length
      * @return
      */
@@ -96,6 +96,25 @@ public static Truthness buildAndAggregationTruthness(Truthness... truthnesses) {
         return new Truthness(averageOfTrue, falseOrAverageFalse);
     }
 
+    public static Truthness buildOrAggregationTruthness(Truthness... truthnesses) {
+        double trueOrAverageTrue = trueOrAverageTrue(truthnesses);
+        double averageOfFalse = averageOfFalse(truthnesses);
+        return new Truthness(trueOrAverageTrue, averageOfFalse);
+    }
+
+    public static Truthness buildXorAggregationTruthness(Truthness left, Truthness right) {
+        Truthness leftAndNotRight = buildAndAggregationTruthness(left,right.invert());
+        Truthness notLeftAndRight = buildAndAggregationTruthness(left.invert(),right);
+        Truthness orAggregation = buildOrAggregationTruthness(leftAndNotRight, notLeftAndRight);
+        return orAggregation;
+    }
+
+    /**
+     * Returns an average of the <code>ofTrue</code> values for the truthnesses.
+     *
+     * @param truthnesses
+     * @return
+     */
     private static double averageOfTrue(Truthness... truthnesses) {
         checkValidTruthnesses(truthnesses);
         double[] getOfTrueValues = Arrays.stream(truthnesses).mapToDouble(Truthness::getOfTrue)
@@ -109,6 +128,13 @@ private static void checkValidTruthnesses(Truthness[] truthnesses) {
         }
     }
 
+    /**
+     * Computes an average of the given values.
+     * If no values are given, an <code>IllegalArgumentException</code> is thrown.
+     *
+     * @param values a non empty list of double values.
+     * @return
+     */
     private static double average(double... values) {
         if (values == null || values.length == 0) {
             throw new IllegalArgumentException("null or empty values");
@@ -120,13 +146,26 @@ private static double average(double... values) {
         return total / values.length;
     }
 
+    /**
+     * Returns the average of the <code>ofFalse</code> values for the truthnesses.
+     *
+     * @param truthnesses
+     * @return
+     */
     private static double averageOfFalse(Truthness... truthnesses) {
         checkValidTruthnesses(truthnesses);
         double[] getOfFalseValues = Arrays.stream(truthnesses).mapToDouble(Truthness::getOfFalse)
                 .toArray();
         return average(getOfFalseValues);
     }
 
+    /**
+     * Returns 1.0d if any of the truthnesses is false, otherwise returns the average of the <code>ofFalse</code> values
+     * for the truthnesses.
+     *
+     * @param truthnesses
+     * @return
+     */
     private static double falseOrAverageFalse(Truthness... truthnesses) {
         checkValidTruthnesses(truthnesses);
         if (Arrays.stream(truthnesses).anyMatch(t -> t.isFalse())) {
@@ -136,11 +175,34 @@ private static double falseOrAverageFalse(Truthness... truthnesses) {
         }
     }
 
+    /**
+     * Returns 1.0d if any of the truthnesses is true, otherwise returns the average of the <code>ofTrue</code> values
+     * for the truthnesses.
+     *
+     * @param truthnesses
+     * @return
+     */
+    private static double trueOrAverageTrue(Truthness... truthnesses) {
+        checkValidTruthnesses(truthnesses);
+        if (Arrays.stream(truthnesses).anyMatch(t -> t.isTrue())) {
+            return 1.0d;
+        } else {
+            return averageOfTrue(truthnesses);
+        }
+    }
+
+    /**
+     * Returns
+     * @param base
+     * @param ofTrueToScale
+     * @return
+     */
     public static Truthness buildScaledTruthness(double base, double ofTrueToScale) {
         final double scaledOfTrue = DistanceHelper.scaleHeuristicWithBase(ofTrueToScale, base);
         final double ofFalse = 1.0d;
         return new Truthness(scaledOfTrue, ofFalse);
     }
 
 
+
 }

client-java/sql/src/main/java/org/evomaster/client/java/sql/internal/ColumnTypeParser.java

@@ -27,6 +27,7 @@ public static Instant getAsInstant(String content) {
         List<Function<String, Instant>> parsers = Arrays.asList(
                 s -> ZonedDateTime.parse(s).toInstant(),
                 Instant::parse,
+                s -> OffsetDateTime.parse(s, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssXXX")).toInstant(),
                 s -> OffsetDateTime.parse(s, DateTimeFormatter.ofPattern("uuuu-MM-dd'T'HH:mm:ss.SSSX")).toInstant(),
                 s -> {
                         /*

client-java/sql/src/main/java/org/evomaster/client/java/sql/internal/ConversionHelper.java

@@ -0,0 +1,38 @@
+package org.evomaster.client.java.sql.internal;
+
+import java.sql.Time;
+import java.time.*;
+
+public class ConversionHelper {
+
+    public static Instant convertToInstant(Object object) {
+        if (object ==null) {
+            return null;
+        } else if (object instanceof Time) {
+            String timeAsString = object.toString();
+            return ColumnTypeParser.getAsInstant(timeAsString);
+        } else if (object instanceof java.sql.Date) {
+            String dateAsString = object.toString();
+            return ColumnTypeParser.getAsInstant(dateAsString);
+        } else if (object instanceof java.util.Date) {
+            return ((java.util.Date) object).toInstant();
+        } else if (object instanceof OffsetDateTime) {
+            return ((OffsetDateTime) object).toInstant();
+        } else if (object instanceof OffsetTime) {
+            OffsetTime offsetTime = (OffsetTime) object;
+            LocalDate localDate = LocalDate.of(1970, 1, 1);
+            LocalDateTime localDateTime = LocalDateTime.of(localDate, offsetTime.toLocalTime());
+            OffsetDateTime offsetDateTime = localDateTime.atOffset(offsetTime.getOffset());
+            return offsetDateTime.toInstant();
+        } else if (object instanceof Long) {
+            Long year = (Long) object;
+            String yearAsDate = year + "-01-01";
+            return ColumnTypeParser.getAsInstant(yearAsDate);
+        } else if (object instanceof String) {
+            String objectAsString = (String) object;
+            return ColumnTypeParser.getAsInstant(objectAsString);
+        } else {
+            throw new IllegalArgumentException("Argument must be date, local date time or string but got " + object.getClass().getName());
+        }
+    }
+}