[jboss-svn-commits] JBL Code SVN: r33287 - in labs/jbossrules/trunk/drools-planner: drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui and 1 other directory.

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

Author: ge0ffrey
Date: 2010-06-01 13:18:02 -0400 (Tue, 01 Jun 2010)
New Revision: 33287

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java
Log:
show difference between presumed and real working memory

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java	2010-06-01 14:14:07 UTC (rev 33286)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/LocalSearchSolverScope.java	2010-06-01 17:18:02 UTC (rev 33287)
@@ -185,20 +185,25 @@
             throw new IllegalStateException(
                     "The presumedScore (" + presumedScore + ") is corrupted because it is not the realScore  ("
                             + realScore + ").\n"
-                    + buildConstraintOccurrenceSummary()); // TODO output buildConstraintOccurrence on tmpWM too
+                    + "Presumed workingMemory:\n" + buildConstraintOccurrenceSummary(workingMemory)
+                    + "Real workingMemory:\n" + buildConstraintOccurrenceSummary(tmpWorkingMemory));
         }
     }
 
+    public String buildConstraintOccurrenceSummary() {
+        return buildConstraintOccurrenceSummary(workingMemory);
+    }
+
     /**
      * TODO Refactor this with the ConstraintOccurrenceTotal class: https://jira.jboss.org/jira/browse/JBRULES-2510
      * @return never null
      */
-    public String buildConstraintOccurrenceSummary() {
-        if (workingMemory == null) {
+    public String buildConstraintOccurrenceSummary(WorkingMemory summaryWorkingMemory) {
+        if (summaryWorkingMemory == null) {
             return "  The workingMemory is null.";
         }
         Map<String, Number> scoreTotalMap = new TreeMap<String, Number>();
-        Iterator<ConstraintOccurrence> it = (Iterator<ConstraintOccurrence>) workingMemory.iterateObjects(
+        Iterator<ConstraintOccurrence> it = (Iterator<ConstraintOccurrence>) summaryWorkingMemory.iterateObjects(
                 new ClassObjectFilter(ConstraintOccurrence.class));
         while (it.hasNext()) {
             ConstraintOccurrence occurrence = it.next();

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java	2010-06-01 14:14:07 UTC (rev 33286)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/common/swingui/WorkflowFrame.java	2010-06-01 17:18:02 UTC (rev 33287)
@@ -218,7 +218,7 @@
                         solutionBusiness.solve();
                     } catch (final Throwable e) {
                         // Otherwise the newFixedThreadPool will eat the exception...
-                        logger.error("Solving failed: " + e.getMessage(), e);
+                        logger.error("Solving failed.", e);
                     }
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {