PLANNER-712 Benchmark should warm up for 30 seconds by default

kiegroup · Jan 3, 2017 · 0b069f3 · 0b069f3
1 parent bb8f078
commit 0b069f3
Show file tree

Hide file tree

Showing 40 changed files with 79 additions and 38 deletions.
diff --git a/...nner-benchmark/src/main/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfig.java b/...nner-benchmark/src/main/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfig.java
@@ -44,6 +44,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+
 @XStreamAlias("plannerBenchmark")
 public class PlannerBenchmarkConfig {
 
@@ -61,6 +63,7 @@ public class PlannerBenchmarkConfig {
     private Long warmUpSecondsSpentLimit = null;
     private Long warmUpMinutesSpentLimit = null;
     private Long warmUpHoursSpentLimit = null;
+    private Long warmUpDaysSpentLimit = null;
 
     @XStreamAlias("benchmarkReport")
     private BenchmarkReportConfig benchmarkReportConfig = null;
@@ -148,6 +151,14 @@ public void setWarmUpHoursSpentLimit(Long warmUpHoursSpentLimit) {
         this.warmUpHoursSpentLimit = warmUpHoursSpentLimit;
     }
 
+    public Long getWarmUpDaysSpentLimit() {
+        return warmUpDaysSpentLimit;
+    }
+
+    public void setWarmUpDaysSpentLimit(Long warmUpDaysSpentLimit) {
+        this.warmUpDaysSpentLimit = warmUpDaysSpentLimit;
+    }
+
     public BenchmarkReportConfig getBenchmarkReportConfig() {
         return benchmarkReportConfig;
     }
@@ -198,7 +209,7 @@ public PlannerBenchmark buildPlannerBenchmark(SolverConfigContext solverConfigCo
         plannerBenchmarkResult.setAggregation(false);
         int parallelBenchmarkCount = resolveParallelBenchmarkCount();
         plannerBenchmarkResult.setParallelBenchmarkCount(parallelBenchmarkCount);
-        plannerBenchmarkResult.setWarmUpTimeMillisSpentLimit(calculateWarmUpTimeMillisSpentLimit());
+        plannerBenchmarkResult.setWarmUpTimeMillisSpentLimit(defaultIfNull(calculateWarmUpTimeMillisSpentLimit(), 30L));
         plannerBenchmarkResult.setUnifiedProblemBenchmarkResultList(new ArrayList<>());
         plannerBenchmarkResult.setSolverBenchmarkResultList(new ArrayList<>(
                 effectiveSolverBenchmarkConfigList.size()));
@@ -331,19 +342,46 @@ protected int resolveParallelBenchmarkCountAutomatically(int availableProcessorC
         }
     }
 
-    protected long calculateWarmUpTimeMillisSpentLimit() {
+    protected Long calculateWarmUpTimeMillisSpentLimit() {
+        if (warmUpMillisecondsSpentLimit == null && warmUpSecondsSpentLimit == null
+                && warmUpMinutesSpentLimit == null && warmUpHoursSpentLimit == null && warmUpDaysSpentLimit == null) {
+            return null;
+        }
         long warmUpTimeMillisSpentLimit = 0L;
         if (warmUpMillisecondsSpentLimit != null) {
+            if (warmUpMillisecondsSpentLimit < 0L) {
+                throw new IllegalArgumentException("The warmUpMillisecondsSpentLimit (" + warmUpMillisecondsSpentLimit
+                        + ") cannot be negative.");
+            }
             warmUpTimeMillisSpentLimit += warmUpMillisecondsSpentLimit;
         }
         if (warmUpSecondsSpentLimit != null) {
-            warmUpTimeMillisSpentLimit += warmUpSecondsSpentLimit * 1000L;
+            if (warmUpSecondsSpentLimit < 0L) {
+                throw new IllegalArgumentException("The warmUpSecondsSpentLimit (" + warmUpSecondsSpentLimit
+                        + ") cannot be negative.");
+            }
+            warmUpTimeMillisSpentLimit += warmUpSecondsSpentLimit * 1_000L;
         }
         if (warmUpMinutesSpentLimit != null) {
-            warmUpTimeMillisSpentLimit += warmUpMinutesSpentLimit * 60000L;
+            if (warmUpMinutesSpentLimit < 0L) {
+                throw new IllegalArgumentException("The warmUpMinutesSpentLimit (" + warmUpMinutesSpentLimit
+                        + ") cannot be negative.");
+            }
+            warmUpTimeMillisSpentLimit += warmUpMinutesSpentLimit * 60_000L;
         }
         if (warmUpHoursSpentLimit != null) {
-            warmUpTimeMillisSpentLimit += warmUpHoursSpentLimit * 3600000L;
+            if (warmUpHoursSpentLimit < 0L) {
+                throw new IllegalArgumentException("The warmUpHoursSpentLimit (" + warmUpHoursSpentLimit
+                        + ") cannot be negative.");
+            }
+            warmUpTimeMillisSpentLimit += warmUpHoursSpentLimit * 3_600_000L;
+        }
+        if (warmUpDaysSpentLimit != null) {
+            if (warmUpDaysSpentLimit < 0L) {
+                throw new IllegalArgumentException("The warmUpDaysSpentLimit (" + warmUpDaysSpentLimit
+                        + ") cannot be negative.");
+            }
+            warmUpTimeMillisSpentLimit += warmUpDaysSpentLimit * 86_400_000L;
         }
         return warmUpTimeMillisSpentLimit;
     }

diff --git a/...-benchmark/src/test/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfigTest.java b/...-benchmark/src/test/java/org/optaplanner/benchmark/config/PlannerBenchmarkConfigTest.java
@@ -151,7 +151,7 @@ public void calculateWarmUpTimeMillisSpentLimit() {
         config.setWarmUpMinutesSpentLimit(2L);
         config.setWarmUpSecondsSpentLimit(5L);
         config.setWarmUpMillisecondsSpentLimit(753L);
-        assertEquals(3_725_753L, config.calculateWarmUpTimeMillisSpentLimit());
+        assertEquals(3_725_753L, (long) config.calculateWarmUpTimeMillisSpentLimit());
     }
 
 }
diff --git a/...est/resources/org/optaplanner/benchmark/api/classloaderTestdataPlannerBenchmarkConfig.xml b/...est/resources/org/optaplanner/benchmark/api/classloaderTestdataPlannerBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>target/benchmarkTest/output</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
   <solverBenchmark>
     <problemBenchmarks>
       <solutionFileIOClass>org.optaplanner.persistence.common.api.domain.solution.RigidTestdataSolutionFileIO</solutionFileIOClass>

diff --git a/...s/org/optaplanner/benchmark/api/classloaderTestdataPlannerBenchmarkConfigTemplate.xml.ftl b/...s/org/optaplanner/benchmark/api/classloaderTestdataPlannerBenchmarkConfigTemplate.xml.ftl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>target/benchmarkTest/output</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 <#list ['FIRST_FIT', 'CHEAPEST_INSERTION'] as constructionHeuristicType>
   <solverBenchmark>
     <problemBenchmarks>

diff --git a/...hmark/src/test/resources/org/optaplanner/benchmark/api/testdataPlannerBenchmarkConfig.xml b/...hmark/src/test/resources/org/optaplanner/benchmark/api/testdataPlannerBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>target/benchmarkTest/output</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
   <solverBenchmark>
     <problemBenchmarks>
       <solutionFileIOClass>org.optaplanner.persistence.common.api.domain.solution.RigidTestdataSolutionFileIO</solutionFileIOClass>

diff --git a/...st/resources/org/optaplanner/benchmark/api/testdataPlannerBenchmarkConfigTemplate.xml.ftl b/...st/resources/org/optaplanner/benchmark/api/testdataPlannerBenchmarkConfigTemplate.xml.ftl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>target/benchmarkTest/output</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 <#list ['FIRST_FIT', 'CHEAPEST_INSERTION'] as constructionHeuristicType>
   <solverBenchmark>
     <problemBenchmarks>

diff --git a/...-core/src/main/java/org/optaplanner/core/config/solver/termination/TerminationConfig.java b/...-core/src/main/java/org/optaplanner/core/config/solver/termination/TerminationConfig.java
@@ -358,28 +358,28 @@ public Long calculateTimeMillisSpentLimit() {
                 throw new IllegalArgumentException("The termination secondsSpentLimit (" + secondsSpentLimit
                         + ") cannot be negative.");
             }
-            timeMillisSpentLimit += secondsSpentLimit * 1000L;
+            timeMillisSpentLimit += secondsSpentLimit * 1_000L;
         }
         if (minutesSpentLimit != null) {
             if (minutesSpentLimit < 0L) {
                 throw new IllegalArgumentException("The termination minutesSpentLimit (" + minutesSpentLimit
                         + ") cannot be negative.");
             }
-            timeMillisSpentLimit += minutesSpentLimit * 60000L;
+            timeMillisSpentLimit += minutesSpentLimit * 60_000L;
         }
         if (hoursSpentLimit != null) {
             if (hoursSpentLimit < 0L) {
                 throw new IllegalArgumentException("The termination hoursSpentLimit (" + hoursSpentLimit
                         + ") cannot be negative.");
             }
-            timeMillisSpentLimit += hoursSpentLimit * 3600000L;
+            timeMillisSpentLimit += hoursSpentLimit * 3_600_000L;
         }
         if (daysSpentLimit != null) {
             if (daysSpentLimit < 0L) {
                 throw new IllegalArgumentException("The termination daysSpentLimit (" + daysSpentLimit
                         + ") cannot be negative.");
             }
-            timeMillisSpentLimit += daysSpentLimit * 86400000L;
+            timeMillisSpentLimit += daysSpentLimit * 86_400_000L;
         }
         return timeMillisSpentLimit;
     }

diff --git a/...ciidoc/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.adoc b/...ciidoc/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.adoc
@@ -235,17 +235,29 @@ Otherwise, an unstable network connection can ruin a long running benchmark.
 [[warmingUpTheHotSpotCompiler]]
 === Warming Up The HotSpot Compiler
 
-**Without a warm up, the results of the first (or first few) benchmarks are not reliable**,
-because they will have lost CPU time on HotSpot JIT compilation (and possibly DRL compilation too).
+Without a warm up, the results of the first (or first few) benchmarks are not reliable,
+because they will lose CPU time on HotSpot JIT compilation (and possibly DRL compilation too).
 
-To avoid that distortion, the benchmarker can run some of the benchmarks for a specified amount of time, before running the real benchmarks.
-Generally, a warm up of 30 seconds suffices:
+To avoid that distortion, the benchmarker runs some of the benchmarks for 30 seconds,
+before running the real benchmarks.
+That default warm up of 30 seconds usually suffices. Change it, for example to give it 60 seconds:
 
 [source,xml,options="nowrap"]
 ----
 <plannerBenchmark>
   ...
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
+  <warmUpSecondsSpentLimit>60</warmUpSecondsSpentLimit>
+  ...
+</plannerBenchmark>
+----
+
+Turn off the warm up phase altogether by setting it to zero:
+
+[source,xml,options="nowrap"]
+----
+<plannerBenchmark>
+  ...
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
   ...
 </plannerBenchmark>
 ----
@@ -267,7 +279,6 @@ To quickly configure and run a benchmark for typical solver configs, use a `solv
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nqueens</benchmarkDirectory>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...in/resources/org/optaplanner/examples/app/benchmark/generalOptaPlannerBenchmarkConfig.xml b/...in/resources/org/optaplanner/examples/app/benchmark/generalOptaPlannerBenchmarkConfig.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/general</benchmarkDirectory>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../org/optaplanner/examples/app/benchmark/generalOptaPlannerBenchmarkConfigTemplate.xml.ftl b/.../org/optaplanner/examples/app/benchmark/generalOptaPlannerBenchmarkConfigTemplate.xml.ftl
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/general/template</benchmarkDirectory>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../main/resources/org/optaplanner/examples/cheaptime/benchmark/cheapTimeBenchmarkConfig.xml b/.../main/resources/org/optaplanner/examples/cheaptime/benchmark/cheapTimeBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/cheaptime</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...ces/org/optaplanner/examples/cheaptime/benchmark/cheapTimeBenchmarkConfigTemplate.xml.ftl b/...ces/org/optaplanner/examples/cheaptime/benchmark/cheapTimeBenchmarkConfigTemplate.xml.ftl
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/cheaptime</benchmarkDirectory>
   <!--<parallelBenchmarkCount>AUTO</parallelBenchmarkCount>-->
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../optaplanner/examples/cloudbalancing/optional/benchmark/cloudBalancingBenchmarkConfig.xml b/.../optaplanner/examples/cloudbalancing/optional/benchmark/cloudBalancingBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/cloudbalancing</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../examples/cloudbalancing/optional/benchmark/cloudBalancingBenchmarkConfigTemplate.xml.ftl b/.../examples/cloudbalancing/optional/benchmark/cloudBalancingBenchmarkConfigTemplate.xml.ftl
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/cloudbalancing/template</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...examples/cloudbalancing/optional/benchmark/cloudBalancingScoreDirectorBenchmarkConfig.xml b/...examples/cloudbalancing/optional/benchmark/cloudBalancingScoreDirectorBenchmarkConfig.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/cloudbalancing/scoreDirector</benchmarkDirectory>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...ner/examples/cloudbalancing/optional/benchmark/cloudBalancingStepLimitBenchmarkConfig.xml b/...ner/examples/cloudbalancing/optional/benchmark/cloudBalancingStepLimitBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/cloudbalancing/stepLimit</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...s/org/optaplanner/examples/curriculumcourse/benchmark/curriculumCourseBenchmarkConfig.xml b/...s/org/optaplanner/examples/curriculumcourse/benchmark/curriculumCourseBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/curriculumcourse</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...anner/examples/curriculumcourse/benchmark/curriculumCourseBenchmarkConfigTemplate.xml.ftl b/...anner/examples/curriculumcourse/benchmark/curriculumCourseBenchmarkConfigTemplate.xml.ftl
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/curriculumcourse/template</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...aplanner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitBenchmarkConfig.xml b/...aplanner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/curriculumcourse/stepLimit</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...n/resources/org/optaplanner/examples/examination/benchmark/examinationBenchmarkConfig.xml b/...n/resources/org/optaplanner/examples/examination/benchmark/examinationBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/examination</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...es/org/optaplanner/examples/examination/benchmark/examinationStepLimitBenchmarkConfig.xml b/...es/org/optaplanner/examples/examination/benchmark/examinationStepLimitBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/examination/stepLimit</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...optaplanner/examples/machinereassignment/benchmark/machineReassignmentBenchmarkConfig.xml b/...optaplanner/examples/machinereassignment/benchmark/machineReassignmentBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/machinereassignment</benchmarkDirectory>
   <!--<parallelBenchmarkCount>AUTO</parallelBenchmarkCount>-->
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...er/examples/machinereassignment/benchmark/machineReassignmentStepLimitBenchmarkConfig.xml b/...er/examples/machinereassignment/benchmark/machineReassignmentStepLimitBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/machinereassignment/stepLimit</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../src/main/resources/org/optaplanner/examples/nqueens/benchmark/nqueensBenchmarkConfig.xml b/.../src/main/resources/org/optaplanner/examples/nqueens/benchmark/nqueensBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nqueens</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...ources/org/optaplanner/examples/nqueens/benchmark/nqueensScoreDirectorBenchmarkConfig.xml b/...ources/org/optaplanner/examples/nqueens/benchmark/nqueensScoreDirectorBenchmarkConfig.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nqueens/scoreDirector</benchmarkDirectory>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../resources/org/optaplanner/examples/nqueens/benchmark/nqueensStepLimitBenchmarkConfig.xml b/.../resources/org/optaplanner/examples/nqueens/benchmark/nqueensStepLimitBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nqueens/stepLimit</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...s/org/optaplanner/examples/nurserostering/benchmark/nurseRosteringLongBenchmarkConfig.xml b/...s/org/optaplanner/examples/nurserostering/benchmark/nurseRosteringLongBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nurserostering/long</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...org/optaplanner/examples/nurserostering/benchmark/nurseRosteringMediumBenchmarkConfig.xml b/...org/optaplanner/examples/nurserostering/benchmark/nurseRosteringMediumBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nurserostering/medium</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/.../optaplanner/examples/nurserostering/benchmark/nurseRosteringStepLimitBenchmarkConfig.xml b/.../optaplanner/examples/nurserostering/benchmark/nurseRosteringStepLimitBenchmarkConfig.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plannerBenchmark>
   <benchmarkDirectory>local/data/nurserostering/stepLimit</benchmarkDirectory>
+  <warmUpSecondsSpentLimit>0</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...ources/org/optaplanner/examples/pas/benchmark/patientAdmissionScheduleBenchmarkConfig.xml b/...ources/org/optaplanner/examples/pas/benchmark/patientAdmissionScheduleBenchmarkConfig.xml
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/pas</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>

diff --git a/...amples/projectjobscheduling/benchmark/projectJobSchedulingBenchmarkConfigTemplate.xml.ftl b/...amples/projectjobscheduling/benchmark/projectJobSchedulingBenchmarkConfigTemplate.xml.ftl
@@ -2,7 +2,6 @@
 <plannerBenchmark>
   <benchmarkDirectory>local/data/projectjobscheduling/template</benchmarkDirectory>
   <parallelBenchmarkCount>AUTO</parallelBenchmarkCount>
-  <warmUpSecondsSpentLimit>30</warmUpSecondsSpentLimit>
 
   <inheritedSolverBenchmark>
     <problemBenchmarks>