[jboss-svn-commits] JBL Code SVN: r33444 - in labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark: statistic and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 10 15:17:39 EDT 2010
Author: ge0ffrey
Date: 2010-06-10 15:17:38 -0400 (Thu, 10 Jun 2010)
New Revision: 33444
Modified:
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java
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/statistic/BestScoreStatistic.java
Log:
method renames: typo milles instead of millis
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java 2010-06-10 18:40:19 UTC (rev 33443)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/MaxScoreSolverBenchmarkComparator.java 2010-06-10 19:17:38 UTC (rev 33444)
@@ -14,7 +14,7 @@
SolverBenchmarkResult bResult = b.getWorstResult();
return new CompareToBuilder()
.append(aResult.getScore(), bResult.getScore())
- .append(- aResult.getTimeMillesSpend(), - bResult.getTimeMillesSpend())
+ .append(- aResult.getTimeMillisSpend(), - bResult.getTimeMillisSpend())
.toComparison();
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java 2010-06-10 18:40:19 UTC (rev 33443)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java 2010-06-10 19:17:38 UTC (rev 33444)
@@ -104,7 +104,7 @@
for (SolverBenchmarkResult solverBenchmarkResult : solverBenchmarkResultList) {
if (worstResult == null || solverBenchmarkResult.getScore().compareTo(worstResult.getScore()) < 0
|| (solverBenchmarkResult.getScore().equals(worstResult.getScore())
- && solverBenchmarkResult.getTimeMillesSpend() > worstResult.getTimeMillesSpend())) {
+ && solverBenchmarkResult.getTimeMillisSpend() > worstResult.getTimeMillisSpend())) {
worstResult = solverBenchmarkResult;
}
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java 2010-06-10 18:40:19 UTC (rev 33443)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkResult.java 2010-06-10 19:17:38 UTC (rev 33444)
@@ -13,7 +13,7 @@
private File unsolvedSolutionFile = null;
private Score score = null;
- private Long timeMillesSpend = null;
+ private Long timeMillisSpend = null;
private File solvedSolutionFile = null;
public File getUnsolvedSolutionFile() {
@@ -32,12 +32,12 @@
this.score = score;
}
- public Long getTimeMillesSpend() {
- return timeMillesSpend;
+ public Long getTimeMillisSpend() {
+ return timeMillisSpend;
}
- public void setTimeMillesSpend(Long timeMillesSpend) {
- this.timeMillesSpend = timeMillesSpend;
+ public void setTimeMillisSpend(Long timeMillisSpend) {
+ this.timeMillisSpend = timeMillisSpend;
}
public File getSolvedSolutionFile() {
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-10 18:40:19 UTC (rev 33443)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java 2010-06-10 19:17:38 UTC (rev 33444)
@@ -11,7 +11,6 @@
import java.io.Reader;
import java.io.Writer;
import java.text.NumberFormat;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -31,7 +30,6 @@
import org.apache.commons.io.IOUtils;
import org.drools.planner.config.localsearch.LocalSearchSolverConfig;
import org.drools.planner.core.Solver;
-import org.drools.planner.core.score.Score;
import org.drools.planner.core.score.definition.ScoreDefinition;
import org.drools.planner.core.solution.Solution;
import org.drools.planner.benchmark.statistic.BestScoreStatistic;
@@ -203,7 +201,7 @@
statistic.addListener(solver, solverBenchmark.getName());
}
solver.solve();
- result.setTimeMillesSpend(solver.getTimeMillisSpend());
+ result.setTimeMillisSpend(solver.getTimeMillisSpend());
Solution solvedSolution = solver.getBestSolution();
result.setScore(solvedSolution.getScore());
if (solverStatisticType != SolverStatisticType.NONE) {
@@ -213,24 +211,24 @@
writeSolvedSolution(xStream, solverBenchmark, result, solvedSolution);
}
}
- writeGraphSummary();
+ writeBestScoreSummary();
// 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(writeBestScoreSummary());
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");
+ htmlFragment.append(statistic.writeStatistic(solverStatisticFilesDirectory, baseName));
}
writeHtmlOverview(htmlFragment);
benchmarkingEnded();
}
- private CharSequence writeGraphSummary() {
+ private CharSequence writeBestScoreSummary() {
DefaultCategoryDataset dataset = new DefaultCategoryDataset();
for (SolverBenchmark solverBenchmark : solverBenchmarkList) {
ScoreDefinition scoreDefinition = solverBenchmark.getLocalSearchSolverConfig().getScoreDefinitionConfig()
@@ -255,7 +253,7 @@
} finally {
IOUtils.closeQuietly(out);
}
- return " <img src=\"" + chartSummaryFile.getName() + "\"/>";
+ return " <img src=\"" + chartSummaryFile.getName() + "\"/>\n";
}
private void writeHtmlOverview(CharSequence htmlFragment) {
@@ -301,7 +299,7 @@
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.getTimeMillesSpend()) + "ms";
+ String timeString = TIME_FORMAT.format(result.getTimeMillisSpend()) + "ms";
solvedSolutionFile = new File(solvedSolutionFilesDirectory, baseName + "_" + solverBenchmarkName
+ "_score" + scoreString + "_time" + timeString + ".xml");
Writer writer = null;
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-10 18:40:19 UTC (rev 33443)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/statistic/BestScoreStatistic.java 2010-06-10 19:17:38 UTC (rev 33444)
@@ -146,7 +146,7 @@
} finally {
IOUtils.closeQuietly(writer);
}
- return " <p><a href=\"" + csvStatisticFile.getName() + "\">CVS file</a></p>";
+ return " <p><a href=\"" + csvStatisticFile.getName() + "\">CVS file</a></p>\n";
}
private CharSequence writeGraphStatistic(File solverStatisticFilesDirectory, String baseName) {
@@ -186,7 +186,7 @@
} finally {
IOUtils.closeQuietly(out);
}
- return " <img src=\"" + graphStatisticFile.getName() + "\"/>";
+ return " <img src=\"" + graphStatisticFile.getName() + "\"/>\n";
}
}
More information about the jboss-svn-commits
mailing list