fix: spec and minor fixes

TimefoldAI · Nov 14, 2024 · 4a7a34a · 4a7a34a
1 parent e11de80
commit 4a7a34a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/benchmark/src/main/resources/benchmark.xsd b/benchmark/src/main/resources/benchmark.xsd
@@ -587,10 +587,10 @@
           <xs:element minOccurs="0" name="moveCountLimit" type="xs:long"/>
 
 
-          <xs:element minOccurs="0" name="flatLineDetectionRatio" type="xs:double"/>
+          <xs:element minOccurs="0" name="stopFlatLineDetectionRatio" type="xs:double"/>
 
 
-          <xs:element minOccurs="0" name="newCurveDetectionRatio" type="xs:double"/>
+          <xs:element minOccurs="0" name="noStopFlatLineDetectionRatio" type="xs:double"/>
 
 
           <xs:element minOccurs="0" name="minimalExecutionTimeSeconds" type="xs:long"/>

diff --git a/...va/ai/timefold/solver/core/impl/solver/termination/UnimprovedBestSolutionTermination.java b/...va/ai/timefold/solver/core/impl/solver/termination/UnimprovedBestSolutionTermination.java
@@ -38,12 +38,12 @@ public final class UnimprovedBestSolutionTermination<Solution_> extends Abstract
     protected Boolean terminate;
 
     public UnimprovedBestSolutionTermination(Double stopFlatLineDetectionRatio,
-                                             Double noStopFlatLineDetectionRatio, Long minimalExecutionTimeSeconds) {
+            Double noStopFlatLineDetectionRatio, Long minimalExecutionTimeSeconds) {
         this(stopFlatLineDetectionRatio, noStopFlatLineDetectionRatio, minimalExecutionTimeSeconds, Clock.systemUTC());
     }
 
     public UnimprovedBestSolutionTermination(Double stopFlatLineDetectionRatio, Double noStopFlatLineDetectionRatio,
-                                             Long minimalExecutionTimeSeconds, Clock clock) {
+            Long minimalExecutionTimeSeconds, Clock clock) {
         this.stopFlatLineDetectionRatio = Objects.requireNonNull(stopFlatLineDetectionRatio,
                 "The field stopFlatLineDetectionRatio is required for the termination UnimprovedBestSolutionTermination");
         this.noStopFlatLineDetectionRatio = Objects.requireNonNull(noStopFlatLineDetectionRatio,
@@ -137,7 +137,7 @@ public boolean isPhaseTerminated(AbstractPhaseScope<Solution_> phaseScope) {
                 initialCurvePointMillis = lastImprovementMillis;
                 previousBest = currentBest;
                 if (logger.isInfoEnabled()) {
-                    logger.debug("Starting a new curve with ({}), estimated time interval ({}s)",
+                    logger.debug("Starting a new curve with ({}), time interval ({}s)",
                             previousBest,
                             String.format("%.2f", completeInterval / 1000.0));
                 }
@@ -191,6 +191,7 @@ public UnimprovedBestSolutionTermination<Solution_> createChildThreadTermination
 
     @Override
     public String toString() {
-        return "UnimprovedBestSolutionTermination(%.2f, %.2f)".formatted(stopFlatLineDetectionRatio, noStopFlatLineDetectionRatio);
+        return "UnimprovedBestSolutionTermination(%.2f, %.2f)".formatted(stopFlatLineDetectionRatio,
+                noStopFlatLineDetectionRatio);
     }
 }
diff --git a/core/src/main/resources/solver.xsd b/core/src/main/resources/solver.xsd
@@ -197,9 +197,9 @@
 
           <xs:element minOccurs="0" name="moveCountLimit" type="xs:long"/>
 
-          <xs:element minOccurs="0" name="flatLineDetectionRatio" type="xs:double"/>
+          <xs:element minOccurs="0" name="stopFlatLineDetectionRatio" type="xs:double"/>
 
-          <xs:element minOccurs="0" name="newCurveDetectionRatio" type="xs:double"/>
+          <xs:element minOccurs="0" name="noStopFlatLineDetectionRatio" type="xs:double"/>
 
           <xs:element minOccurs="0" name="minimalExecutionTimeSeconds" type="xs:long"/>