[jboss-svn-commits] JBL Code SVN: r33350 - in labs/jbossrules/trunk: drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 4 09:30:09 EDT 2010
Author: ge0ffrey
Date: 2010-06-04 09:30:07 -0400 (Fri, 04 Jun 2010)
New Revision: 33350
Modified:
labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
Log:
benchmarkDirectory: less config to configure a benchmarker
Modified: labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -33,7 +33,7 @@
<programlisting><?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nqueens/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nqueens</benchmarkDirectory>
<inheritedUnsolvedSolutionFile>data/nqueens/unsolved/unsolvedNQueens32.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nqueens/unsolved/unsolvedNQueens64.xml</inheritedUnsolvedSolutionFile>
@@ -97,8 +97,8 @@
part of multiple <literal>solverBenchmark</literal> entities can be extracted to the <literal>inherited</literal>
entities and can be overwritten per <literal>solverBenchmark</literal> entity.</para>
- <para>If you specify a <literal>solvedSolutionFilesDirectory</literal> (relative to the working directory), the best
- solution of each solver run will be written to that directory.</para>
+ <para>You need to specify a <literal>benchmarkDirectory</literal> (relative to the working directory).
+ A summary chart and the best solution of each solver run will be written in that directory.</para>
</section>
<section>
@@ -117,13 +117,12 @@
</mediaobject>
</figure>
- <para>To configure graph and CSV output of the best score over time, just add the
- <literal>solverStatisticType</literal> and the <literal>solverStatisticFilesDirectory</literal> lines:</para>
+ <para>To configure graph and CSV output of the best score over time, just add a
+ <literal>solverStatisticType</literal> line:</para>
<programlisting><solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nqueens/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nqueens/solved</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/nqueens/statistic</solverStatisticFilesDirectory>
...
</solverBenchmarkSuite></programlisting>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java 2010-06-04 13:30:07 UTC (rev 33350)
@@ -49,12 +49,12 @@
public static final NumberFormat TIME_FORMAT = NumberFormat.getIntegerInstance(Locale.ENGLISH);
- private SolvedSolutionVerbosity solvedSolutionVerbosity = null;
+ private File benchmarkDirectory = null;
private File solvedSolutionFilesDirectory = null;
+ private File solverStatisticFilesDirectory = null;
+ private SolverStatisticType solverStatisticType = SolverStatisticType.NONE;
private boolean sortSolverBenchmarks = true;
private Comparator<SolverBenchmark> solverBenchmarkComparator = null;
- private SolverStatisticType solverStatisticType = SolverStatisticType.NONE;
- private File solverStatisticFilesDirectory = null;
@XStreamAlias("inheritedLocalSearchSolver")
private LocalSearchSolverConfig inheritedLocalSearchSolverConfig = null;
@@ -64,12 +64,13 @@
@XStreamImplicit(itemFieldName = "solverBenchmark")
private List<SolverBenchmark> solverBenchmarkList = null;
- public SolvedSolutionVerbosity getSolvedSolutionVerbosity() {
- return solvedSolutionVerbosity;
+
+ public File getBenchmarkDirectory() {
+ return benchmarkDirectory;
}
- public void setSolvedSolutionVerbosity(SolvedSolutionVerbosity solvedSolutionVerbosity) {
- this.solvedSolutionVerbosity = solvedSolutionVerbosity;
+ public void setBenchmarkDirectory(File benchmarkDirectory) {
+ this.benchmarkDirectory = benchmarkDirectory;
}
public File getSolvedSolutionFilesDirectory() {
@@ -80,22 +81,14 @@
this.solvedSolutionFilesDirectory = solvedSolutionFilesDirectory;
}
- public boolean isSortSolverBenchmarks() {
- return sortSolverBenchmarks;
+ public File getSolverStatisticFilesDirectory() {
+ return solverStatisticFilesDirectory;
}
- public void setSortSolverBenchmarks(boolean sortSolverBenchmarks) {
- this.sortSolverBenchmarks = sortSolverBenchmarks;
+ public void setSolverStatisticFilesDirectory(File solverStatisticFilesDirectory) {
+ this.solverStatisticFilesDirectory = solverStatisticFilesDirectory;
}
- public Comparator<SolverBenchmark> getSolverBenchmarkComparator() {
- return solverBenchmarkComparator;
- }
-
- public void setSolverBenchmarkComparator(Comparator<SolverBenchmark> solverBenchmarkComparator) {
- this.solverBenchmarkComparator = solverBenchmarkComparator;
- }
-
public SolverStatisticType getSolverStatisticType() {
return solverStatisticType;
}
@@ -104,14 +97,22 @@
this.solverStatisticType = solverStatisticType;
}
- public File getSolverStatisticFilesDirectory() {
- return solverStatisticFilesDirectory;
+ public boolean isSortSolverBenchmarks() {
+ return sortSolverBenchmarks;
}
- public void setSolverStatisticFilesDirectory(File solverStatisticFilesDirectory) {
- this.solverStatisticFilesDirectory = solverStatisticFilesDirectory;
+ public void setSortSolverBenchmarks(boolean sortSolverBenchmarks) {
+ this.sortSolverBenchmarks = sortSolverBenchmarks;
}
+ public Comparator<SolverBenchmark> getSolverBenchmarkComparator() {
+ return solverBenchmarkComparator;
+ }
+
+ public void setSolverBenchmarkComparator(Comparator<SolverBenchmark> solverBenchmarkComparator) {
+ this.solverBenchmarkComparator = solverBenchmarkComparator;
+ }
+
public LocalSearchSolverConfig getInheritedLocalSearchSolverConfig() {
return inheritedLocalSearchSolverConfig;
}
@@ -170,24 +171,23 @@
solverBenchmark.setName(generatedName);
generatedNameIndex++;
}
+ if (benchmarkDirectory == null) {
+ throw new IllegalArgumentException("The benchmarkDirectory (" + benchmarkDirectory + ") must not be null.");
+ }
+ benchmarkDirectory.mkdirs();
+ if (solvedSolutionFilesDirectory == null) {
+ solvedSolutionFilesDirectory = new File(benchmarkDirectory, "solved");
+ }
+ solvedSolutionFilesDirectory.mkdirs();
+ if (solverStatisticFilesDirectory == null) {
+ solverStatisticFilesDirectory = new File(benchmarkDirectory, "statistic");
+ }
+ solverStatisticFilesDirectory.mkdirs();
}
public void benchmark(XStream xStream) { // TODO refactor out xstream
benchmarkingStarted();
- if (solvedSolutionFilesDirectory != null) {
- solvedSolutionFilesDirectory.mkdirs();
- }
- Map<File, SolverStatistic> unsolvedSolutionFileToStatisticMap;
- if (solverStatisticType != SolverStatisticType.NONE) {
- unsolvedSolutionFileToStatisticMap = new HashMap<File, SolverStatistic>();
- if (solverStatisticFilesDirectory == null) {
- throw new IllegalArgumentException("With solverStatisticType (" + solverStatisticType
- + ") the solverStatisticFilesDirectory must not be null.");
- }
- solverStatisticFilesDirectory.mkdirs();
- } else {
- unsolvedSolutionFileToStatisticMap = null;
- }
+ Map<File, SolverStatistic> unsolvedSolutionFileToStatisticMap = new HashMap<File, SolverStatistic>();
for (SolverBenchmark solverBenchmark : solverBenchmarkList) {
Solver solver = solverBenchmark.getLocalSearchSolverConfig().buildSolver();
for (SolverBenchmarkResult result : solverBenchmark.getSolverBenchmarkResultList()) {
@@ -214,21 +214,19 @@
}
}
writeGraphSummary();
- if (solverStatisticType != SolverStatisticType.NONE) {
- // 2 lines at 80 chars per line give a max of 160 per entry
- StringBuilder htmlFragment = new StringBuilder(unsolvedSolutionFileToStatisticMap.size() * 160);
- htmlFragment.append(" <h1>Summary</h1>\n");
- htmlFragment.append(writeGraphSummary()).append("\n");
- htmlFragment.append(" <h1>Statistic ").append(solverStatisticType.toString()).append("</h1>\n");
- for (Map.Entry<File, SolverStatistic> entry : unsolvedSolutionFileToStatisticMap.entrySet()) {
- File unsolvedSolutionFile = entry.getKey();
- SolverStatistic statistic = entry.getValue();
- String baseName = FilenameUtils.getBaseName(unsolvedSolutionFile.getName());
- htmlFragment.append(" <h2>").append(baseName).append("</h2>\n");
- htmlFragment.append(statistic.writeStatistic(solverStatisticFilesDirectory, baseName)).append("\n");
- }
- writeHtmlOverview(htmlFragment);
+ // 2 lines at 80 chars per line give a max of 160 per entry
+ StringBuilder htmlFragment = new StringBuilder(unsolvedSolutionFileToStatisticMap.size() * 160);
+ htmlFragment.append(" <h1>Summary</h1>\n");
+ htmlFragment.append(writeGraphSummary()).append("\n");
+ htmlFragment.append(" <h1>Statistic ").append(solverStatisticType.toString()).append("</h1>\n");
+ for (Map.Entry<File, SolverStatistic> entry : unsolvedSolutionFileToStatisticMap.entrySet()) {
+ File unsolvedSolutionFile = entry.getKey();
+ SolverStatistic statistic = entry.getValue();
+ String baseName = FilenameUtils.getBaseName(unsolvedSolutionFile.getName());
+ htmlFragment.append(" <h2>").append(baseName).append("</h2>\n");
+ htmlFragment.append(statistic.writeStatistic(solverStatisticFilesDirectory, baseName)).append("\n");
}
+ writeHtmlOverview(htmlFragment);
benchmarkingEnded();
}
@@ -325,10 +323,6 @@
Collections.sort(solverBenchmarkList, solverBenchmarkComparator);
}
}
-
- public static enum SolvedSolutionVerbosity {
- ALL
- }
public static enum SolverStatisticType {
NONE,
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/curriculumcourse/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/curriculumcourse</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/curriculumcourse/statistic</solverStatisticFilesDirectory>
<!--<inheritedUnsolvedSolutionFile>data/curriculumcourse/unsolved/comp01.xml</inheritedUnsolvedSolutionFile>-->
<!--<inheritedUnsolvedSolutionFile>data/curriculumcourse/unsolved/comp02.xml</inheritedUnsolvedSolutionFile>-->
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/curriculumcourse/solved</solvedSolutionFilesDirectory>
- <!-- solverBenchmarkResultComparator -->
+ <benchmarkDirectory>local/data/curriculumcourse</benchmarkDirectory>
<inheritedUnsolvedSolutionFile>data/curriculumcourse/unsolved/comp01_initialized.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/examination/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/examination</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/examination/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set1.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set2.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/examination/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/examination</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/examination/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/examination/unsolved/exam_comp_set1_initialized.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nqueens/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nqueens</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/nqueens/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/nqueens/unsolved/unsolvedNQueens32.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nqueens/unsolved/unsolvedNQueens64.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nurserostering/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nurserostering</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/nurserostering/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/long01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/long02.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nurserostering/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nurserostering</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/nurserostering/statistic</solverStatisticFilesDirectory>
-
+
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/medium01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/medium02.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/medium03.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nurserostering/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nurserostering</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/nurserostering/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint02.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/nurserostering/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/nurserostering</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/nurserostering/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/medium_late01_initialized.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/pas/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/pas</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/pas/statistic</solverStatisticFilesDirectory>
- <!-- solverBenchmarkResultComparator -->
<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/pas/unsolved/testdata02.xml</inheritedUnsolvedSolutionFile>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/travelingtournament/smart/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/travelingtournament/smart</benchmarkDirectory>
<inheritedUnsolvedSolutionFile>data/travelingtournament/smart/unsolved/1-nl14.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml 2010-06-04 13:30:07 UTC (rev 33350)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<solverBenchmarkSuite>
- <solvedSolutionFilesDirectory>local/data/travelingtournament/smart/solved</solvedSolutionFilesDirectory>
+ <benchmarkDirectory>local/data/travelingtournament/smart</benchmarkDirectory>
<solverStatisticType>BEST_SOLUTION_CHANGED</solverStatisticType>
- <solverStatisticFilesDirectory>local/data/travelingtournament/smart/statistic</solverStatisticFilesDirectory>
<inheritedUnsolvedSolutionFile>data/travelingtournament/smart/unsolved/1-nl10.xml</inheritedUnsolvedSolutionFile>
<inheritedLocalSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
===================================================================
--- labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2010-06-04 13:21:43 UTC (rev 33349)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2010-06-04 13:30:07 UTC (rev 33350)
@@ -299,3 +299,20 @@
return null;
}
}
+
+A benchmarker config no longer supports solvedSolutionVerbosity (only ALL was supported anyway).
+Before in *BenchmarkConfig.xml:
+ <solvedSolutionVerbosity>ALL</solvedSolutionVerbosity>
+
+A benchmarker config now needs a benchmarkDirectory directory
+and solvedSolutionFilesDirectory and solverStatisticFilesDirectory are no longer required.
+Before in *BenchmarkConfig.xml:
+ <solverBenchmarkSuite>
+ <solvedSolutionFilesDirectory>local/data/nurserostering/solved</solvedSolutionFilesDirectory>
+ ...
+ <solverStatisticFilesDirectory>local/data/nurserostering/statistic</solverStatisticFilesDirectory>
+ ...
+After in *BenchmarkConfig.xml:
+ <solverBenchmarkSuite>
+ <benchmarkDirectory>local/data/nurserostering</benchmarkDirectory>
+ ...
More information about the jboss-svn-commits
mailing list