[jboss-svn-commits] JBL Code SVN: r33467 - in labs/jbossrules/trunk/drools-planner: drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jun 13 07:51:43 EDT 2010
Author: ge0ffrey
Date: 2010-06-13 07:51:42 -0400 (Sun, 13 Jun 2010)
New Revision: 33467
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/XmlSolverBenchmarker.java
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
Log:
remove benchmark writeResults() method + bigger charts/graphs
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-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -3,12 +3,14 @@
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.text.NumberFormat;
import java.util.Collections;
@@ -211,6 +213,53 @@
writeSolvedSolution(xStream, solverBenchmark, result, solvedSolution);
}
}
+ benchmarkingEnded(xStream, unsolvedSolutionFileToStatisticMap);
+ }
+
+ private Solution readUnsolvedSolution(XStream xStream, File unsolvedSolutionFile) {
+ Solution unsolvedSolution;
+ Reader reader = null;
+ try {
+ reader = new InputStreamReader(new FileInputStream(unsolvedSolutionFile), "utf-8");
+ unsolvedSolution = (Solution) xStream.fromXML(reader);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Problem reading unsolvedSolutionFile: " + unsolvedSolutionFile, e);
+ } finally {
+ IOUtils.closeQuietly(reader);
+ }
+ return unsolvedSolution;
+ }
+
+ private void writeSolvedSolution(XStream xStream, SolverBenchmark solverBenchmark, SolverBenchmarkResult result,
+ Solution solvedSolution) {
+ if (solvedSolutionFilesDirectory == null) {
+ return;
+ }
+ File solvedSolutionFile = null;
+ String baseName = FilenameUtils.getBaseName(result.getUnsolvedSolutionFile().getName());
+ String solverBenchmarkName = solverBenchmark.getName().replaceAll(" ", "_").replaceAll("[^\\w\\d_\\-]", "");
+ String scoreString = result.getScore().toString().replaceAll("[\\/ ]", "_");
+ String timeString = TIME_FORMAT.format(result.getTimeMillisSpend()) + "ms";
+ solvedSolutionFile = new File(solvedSolutionFilesDirectory, baseName + "_" + solverBenchmarkName
+ + "_score" + scoreString + "_time" + timeString + ".xml");
+ Writer writer = null;
+ try {
+ writer = new OutputStreamWriter(new FileOutputStream(solvedSolutionFile), "utf-8");
+ xStream.toXML(solvedSolution, writer);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Problem writing solvedSolutionFile: " + solvedSolutionFile, e);
+ } finally {
+ IOUtils.closeQuietly(writer);
+ }
+ }
+
+ public void benchmarkingEnded(XStream xStream, Map<File, SolverStatistic> unsolvedSolutionFileToStatisticMap) {
+ if (sortSolverBenchmarks) {
+ if (solverBenchmarkComparator == null) {
+ solverBenchmarkComparator = new AverageScoreSolverBenchmarkComparator();
+ }
+ Collections.sort(solverBenchmarkList, solverBenchmarkComparator);
+ }
writeBestScoreSummary();
// 2 lines at 80 chars per line give a max of 160 per entry
StringBuilder htmlFragment = new StringBuilder(unsolvedSolutionFileToStatisticMap.size() * 160);
@@ -225,7 +274,7 @@
htmlFragment.append(statistic.writeStatistic(solverStatisticFilesDirectory, baseName));
}
writeHtmlOverview(htmlFragment);
- benchmarkingEnded();
+ writeBenchmarkResult(xStream);
}
private CharSequence writeBestScoreSummary() {
@@ -242,7 +291,7 @@
"Best score summary (higher score is better)", "Data", "Score",
dataset, PlotOrientation.VERTICAL, true, true, false
);
- BufferedImage chartImage = chart.createBufferedImage(800, 600);
+ BufferedImage chartImage = chart.createBufferedImage(1024, 768);
File chartSummaryFile = new File(solverStatisticFilesDirectory, "summary.png");
OutputStream out = null;
try {
@@ -276,52 +325,22 @@
}
}
- private Solution readUnsolvedSolution(XStream xStream, File unsolvedSolutionFile) {
- Solution unsolvedSolution;
- Reader reader = null;
+ public void writeBenchmarkResult(XStream xStream) {
+ File benchmarkResultFile = new File(benchmarkDirectory, "benchmarkResult.xml");
+ OutputStreamWriter writer = null;
try {
- reader = new InputStreamReader(new FileInputStream(unsolvedSolutionFile), "utf-8");
- unsolvedSolution = (Solution) xStream.fromXML(reader);
- } catch (IOException e) {
- throw new IllegalArgumentException("Problem reading unsolvedSolutionFile: " + unsolvedSolutionFile, e);
+ writer = new OutputStreamWriter(new FileOutputStream(benchmarkResultFile), "utf-8");
+ xStream.toXML(this, writer);
+ } catch (UnsupportedEncodingException e) {
+ throw new IllegalStateException("This JVM does not support utf-8 encoding.", e);
+ } catch (FileNotFoundException e) {
+ throw new IllegalArgumentException(
+ "Could not create benchmarkResultFile (" + benchmarkResultFile + ").", e);
} finally {
- IOUtils.closeQuietly(reader);
- }
- return unsolvedSolution;
- }
-
- private void writeSolvedSolution(XStream xStream, SolverBenchmark solverBenchmark, SolverBenchmarkResult result,
- Solution solvedSolution) {
- if (solvedSolutionFilesDirectory == null) {
- return;
- }
- File solvedSolutionFile = null;
- String baseName = FilenameUtils.getBaseName(result.getUnsolvedSolutionFile().getName());
- String solverBenchmarkName = solverBenchmark.getName().replaceAll(" ", "_").replaceAll("[^\\w\\d_\\-]", "");
- String scoreString = result.getScore().toString().replaceAll("[\\/ ]", "_");
- String timeString = TIME_FORMAT.format(result.getTimeMillisSpend()) + "ms";
- solvedSolutionFile = new File(solvedSolutionFilesDirectory, baseName + "_" + solverBenchmarkName
- + "_score" + scoreString + "_time" + timeString + ".xml");
- Writer writer = null;
- try {
- writer = new OutputStreamWriter(new FileOutputStream(solvedSolutionFile), "utf-8");
- xStream.toXML(solvedSolution, writer);
- } catch (IOException e) {
- throw new IllegalArgumentException("Problem writing solvedSolutionFile: " + solvedSolutionFile, e);
- } finally {
IOUtils.closeQuietly(writer);
}
}
- public void benchmarkingEnded() {
- if (sortSolverBenchmarks) {
- if (solverBenchmarkComparator == null) {
- solverBenchmarkComparator = new AverageScoreSolverBenchmarkComparator();
- }
- Collections.sort(solverBenchmarkList, solverBenchmarkComparator);
- }
- }
-
public static enum SolverStatisticType {
NONE,
BEST_SOLUTION_CHANGED;
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/XmlSolverBenchmarker.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -72,19 +72,4 @@
suite.benchmark(xStream);
}
- public void writeResults(File resultFile) {
- resultFile.getParentFile().mkdirs();
- OutputStreamWriter writer = null;
- try {
- writer = new OutputStreamWriter(new FileOutputStream(resultFile), "utf-8");
- xStream.toXML(suite, writer);
- } catch (UnsupportedEncodingException e) {
- throw new IllegalStateException("This vm does not support utf-8 encoding.", e);
- } catch (FileNotFoundException e) {
- throw new IllegalArgumentException("Could not create file: " + resultFile, e);
- } finally {
- IOUtils.closeQuietly(writer);
- }
- }
-
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -175,7 +175,7 @@
plot.setOrientation(PlotOrientation.VERTICAL);
JFreeChart chart = new JFreeChart(baseName + " best score statistic",
JFreeChart.DEFAULT_TITLE_FONT, plot, true);
- BufferedImage chartImage = chart.createBufferedImage(800, 600);
+ BufferedImage chartImage = chart.createBufferedImage(1024, 768);
File graphStatisticFile = new File(solverStatisticFilesDirectory, baseName + "Statistic.png");
OutputStream out = null;
try {
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -11,19 +11,16 @@
private static final String LOGGING_CONFIG = "/org/drools/planner/examples/common/app/log4j-benchmark.xml";
- private File resultFile;
protected XmlSolverBenchmarker solverBenchmarker;
- protected CommonBenchmarkApp(String solverBenchmarkConfig, File resultFile, Class ... xstreamAnnotations) {
+ protected CommonBenchmarkApp(String solverBenchmarkConfig, Class ... xstreamAnnotations) {
super(LOGGING_CONFIG);
- this.resultFile = resultFile;
solverBenchmarker = new XmlSolverBenchmarker().configure(solverBenchmarkConfig);
solverBenchmarker.addXstreamAnnotations(xstreamAnnotations);
}
public void process() {
solverBenchmarker.benchmark();
- solverBenchmarker.writeResults(resultFile);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -14,8 +14,6 @@
= "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml";
- public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/curriculumcourse/curriculumCourseSolverBenchmarkResult.xml");
public static void main(String[] args) {
String solverConfig;
@@ -30,11 +28,11 @@
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
}
- new CurriculumCourseBenchmarkApp(solverConfig, SOLVER_BENCHMARK_RESULT_FILE).process();
+ new CurriculumCourseBenchmarkApp(solverConfig).process();
}
- public CurriculumCourseBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile, CurriculumCourseSchedule.class);
+ public CurriculumCourseBenchmarkApp(String solverBenchmarkConfig) {
+ super(solverBenchmarkConfig, CurriculumCourseSchedule.class);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -15,9 +15,6 @@
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml";
- public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/examination/examinationSolverBenchmarkResult.xml");
-
public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
@@ -31,11 +28,11 @@
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
}
- new ExaminationBenchmarkApp(solverConfig, SOLVER_BENCHMARK_RESULT_FILE).process();
+ new ExaminationBenchmarkApp(solverConfig).process();
}
- public ExaminationBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile, Examination.class);
+ public ExaminationBenchmarkApp(String solverBenchmarkConfig) {
+ super(solverBenchmarkConfig, Examination.class);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -12,15 +12,13 @@
public static final String SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml";
- public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/nqueens/nqueensSolverBenchmarkResult.xml");
public static void main(String[] args) {
- new NQueensBenchmarkApp(SOLVER_BENCHMARK_CONFIG, SOLVER_BENCHMARK_RESULT_FILE).process();
+ new NQueensBenchmarkApp(SOLVER_BENCHMARK_CONFIG).process();
}
- public NQueensBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile, NQueens.class);
+ public NQueensBenchmarkApp(String solverBenchmarkConfig) {
+ super(solverBenchmarkConfig, NQueens.class);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -18,9 +18,6 @@
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml";
-
- public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/nurserostering/nurseRosteringSolverBenchmarkResult.xml");
public static void main(String[] args) {
String solverConfig;
@@ -39,11 +36,11 @@
} else {
solverConfig = MEDIUM_SOLVER_BENCHMARK_CONFIG;
}
- new NurseRosteringBenchmarkApp(solverConfig, SOLVER_BENCHMARK_RESULT_FILE).process();
+ new NurseRosteringBenchmarkApp(solverConfig).process();
}
- public NurseRosteringBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile, NurseRoster.class);
+ public NurseRosteringBenchmarkApp(String solverBenchmarkConfig) {
+ super(solverBenchmarkConfig, NurseRoster.class);
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -14,8 +14,6 @@
= "/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml";
public static final String SHORT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleShortSolverBenchmarkConfig.xml";
- public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/pas/patientAdmissionScheduleSolverBenchmarkResult.xml");
public static void main(String[] args) {
String solverConfig;
@@ -24,11 +22,11 @@
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
}
- new PatientAdmissionScheduleBenchmarkApp(solverConfig, SOLVER_BENCHMARK_RESULT_FILE).process();
+ new PatientAdmissionScheduleBenchmarkApp(solverConfig).process();
}
- public PatientAdmissionScheduleBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile, PatientAdmissionSchedule.class);
+ public PatientAdmissionScheduleBenchmarkApp(String solverBenchmarkConfig) {
+ super(solverBenchmarkConfig, PatientAdmissionSchedule.class);
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java 2010-06-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/travelingtournament/app/smart/SmartTravelingTournamentBenchmarkApp.java 2010-06-13 11:51:42 UTC (rev 33467)
@@ -14,8 +14,6 @@
= "/org/drools/planner/examples/travelingtournament/benchmark/smart/";
public static final String SOLVER_BENCHMARK_CONFIG
= SOLVER_BENCHMARK_CONFIG_PREFIX + "smartTravelingTournamentSolverBenchmarkConfig.xml";
- public static final File SOLVER_BENCHMARK_RESULT_FILE
- = new File("local/data/travelingtournament/smart/smartTravelingTournamentSolverBenchmarkResult.xml");
public static void main(String[] args) {
String solverBenchmarkConfig;
@@ -25,11 +23,11 @@
} else {
solverBenchmarkConfig = SOLVER_BENCHMARK_CONFIG;
}
- new SmartTravelingTournamentBenchmarkApp(solverBenchmarkConfig, SOLVER_BENCHMARK_RESULT_FILE).process();
+ new SmartTravelingTournamentBenchmarkApp(solverBenchmarkConfig).process();
}
- public SmartTravelingTournamentBenchmarkApp(String solverBenchmarkConfig, File resultFile) {
- super(solverBenchmarkConfig, resultFile, TravelingTournament.class);
+ public SmartTravelingTournamentBenchmarkApp(String solverBenchmarkConfig) {
+ super(solverBenchmarkConfig, TravelingTournament.class);
}
}
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-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-13 11:51:42 UTC (rev 33467)
@@ -6,26 +6,26 @@
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint01.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint02.xml</inheritedUnsolvedSolutionFile>
<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint03.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint04.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint05.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint06.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint07.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint08.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint09.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint10.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint01.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint02.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint03.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late01.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late02.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late03.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late04.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late05.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late06.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late07.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late08.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late09.xml</inheritedUnsolvedSolutionFile>
- <inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late10.xml</inheritedUnsolvedSolutionFile>
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint04.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint05.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint06.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint07.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint08.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint09.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint10.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint01.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint02.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_hint03.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late01.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late02.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late03.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late04.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late05.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late06.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late07.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late08.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late09.xml</inheritedUnsolvedSolutionFile>-->
+ <!--<inheritedUnsolvedSolutionFile>data/nurserostering/unsolved/sprint_late10.xml</inheritedUnsolvedSolutionFile>-->
<inheritedLocalSearchSolver>
<scoreDrl>/org/drools/planner/examples/nurserostering/solver/nurseRosteringScoreRules.drl</scoreDrl>
@@ -65,7 +65,7 @@
</localSearchSolver>
</solverBenchmark>
<solverBenchmark>
- <name>absolute100_moveTabu7</name>
+ <name>pillarPart100</name>
<localSearchSolver>
<selector>
<selector>
@@ -76,10 +76,14 @@
<moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentSwitchMoveFactory</moveFactoryClass>
<absoluteSelection>100</absoluteSelection>
</selector>
+ <selector>
+ <moveFactoryClass>org.drools.planner.examples.nurserostering.solver.move.factory.AssignmentPillarPartSwitchMoveFactory</moveFactoryClass>
+ <absoluteSelection>100</absoluteSelection>
+ </selector>
</selector>
<acceptor>
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
- <completeMoveTabuSize>7</completeMoveTabuSize>
+ <completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
<foragerType>MAX_SCORE_OF_ALL</foragerType>
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-13 10:42:43 UTC (rev 33466)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2010-06-13 11:51:42 UTC (rev 33467)
@@ -323,8 +323,14 @@
A benchmarker no longer uses WorstScoreSolverBenchmarkComparator by default.
It now uses AverageScoreSolverBenchmarkComparator by default.
+The benchmarker method writeResults(resultFile) has been removed.
+The result is now always written at the end of the benchmark() method
+in the benchmarkDirectory directory in a file called benchmarkResult.xml.
+Before in *.java:
+ solverBenchmarker.writeResults(...);
-The method Score.substract has been renamed to Score.subtract
+
+The method Score.substract(subtrahend) has been renamed to Score.subtract
Before in *Score.java:
public ...Score substract(...Score subtrahend) {
After in *Score.java:
More information about the jboss-svn-commits
mailing list