[jboss-svn-commits] JBL Code SVN: r33828 - in labs/jbossrules/trunk/drools-planner: src/main/assembly/docs and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-07-11 10:47:09 -0400 (Sun, 11 Jul 2010)
New Revision: 33828

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/SolverBenchmarkSuite.java
   labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
Log:
benchmarker: fix stupid mistake in getAverageScore()

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-07-11 14:30:43 UTC (rev 33827)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmark.java	2010-07-11 14:47:09 UTC (rev 33828)
@@ -109,7 +109,6 @@
     }
 
     /**
-     * Note that the average score
      * @return the average score
      */
     public Score getAverageScore() {
@@ -118,7 +117,7 @@
             if (totalScore == null) {
                 totalScore = solverBenchmarkResult.getScore();
             } else {
-                totalScore.add(solverBenchmarkResult.getScore());
+                totalScore = totalScore.add(solverBenchmarkResult.getScore());
             }
         }
         return totalScore.divide(solverBenchmarkResultList.size());

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-07-11 14:30:43 UTC (rev 33827)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java	2010-07-11 14:47:09 UTC (rev 33828)
@@ -267,7 +267,9 @@
         // 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("  <h2>Summary chart</h2>\n");
         htmlFragment.append(writeBestScoreSummaryChart());
+        htmlFragment.append("  <h2>Summary table</h2>\n");
         htmlFragment.append(writeBestScoreSummaryTable());
         htmlFragment.append("  <h1>Statistic ").append(solverStatisticType.toString()).append("</h1>\n");
         for (Map.Entry<File, SolverStatistic> entry : unsolvedSolutionFileToStatisticMap.entrySet()) {

Modified: labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
===================================================================
--- labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt	2010-07-11 14:30:43 UTC (rev 33827)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt	2010-07-11 14:47:09 UTC (rev 33828)
@@ -393,7 +393,7 @@
     }
 
 There's now a decent simulated annealing implementation.
-In many cases it clearly beats the tabu search implementation.
+In many use cases it clearly beats the tabu search implementation.
 See the reference manual and the nurse rostering example for more info.
 
 The ForagerType has been renamed to the PickEarlyType.