[jboss-svn-commits] JBL Code SVN: r33470 - labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark.

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

Author: ge0ffrey
Date: 2010-06-13 08:37:27 -0400 (Sun, 13 Jun 2010)
New Revision: 33470

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/WorstScoreSolverBenchmarkComparator.java
Log:
fix comparator orders

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 12:16:40 UTC (rev 33469)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/SolverBenchmarkSuite.java	2010-06-13 12:37:27 UTC (rev 33470)
@@ -259,6 +259,7 @@
                 solverBenchmarkComparator = new AverageScoreSolverBenchmarkComparator();
             }
             Collections.sort(solverBenchmarkList, solverBenchmarkComparator);
+            Collections.reverse(solverBenchmarkList); // Best results first, worst results last
         }
         writeBestScoreSummary();
         // 2 lines at 80 chars per line give a max of 160 per entry

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/WorstScoreSolverBenchmarkComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/WorstScoreSolverBenchmarkComparator.java	2010-06-13 12:16:40 UTC (rev 33469)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/benchmark/WorstScoreSolverBenchmarkComparator.java	2010-06-13 12:37:27 UTC (rev 33470)
@@ -14,11 +14,11 @@
 
     public int compare(SolverBenchmark a, SolverBenchmark b) {
         List<Score> aScoreList = a.getScoreList();
-        Collections.sort(aScoreList);
+        Collections.sort(aScoreList); // Worst scores become first in the list
         List<Score> bScoreList = b.getScoreList();
-        Collections.sort(bScoreList);
+        Collections.sort(bScoreList); // Worst scores become first in the list
         return new CompareToBuilder()
-                .append(bScoreList.toArray(), aScoreList.toArray()) // Descending (start with the worst scores)
+                .append(aScoreList.toArray(), bScoreList.toArray())
                 .toComparison();
     }