[jboss-svn-commits] JBL Code SVN: r32245 - in labs/jbossrules/trunk/drools-planner: drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver and 1 other directories.

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

Author: ge0ffrey
Date: 2010-03-26 12:13:44 -0400 (Fri, 26 Mar 2010)
New Revision: 32245

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml
Log:
corrupted undo move should also output the scores that are different

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java	2010-03-26 16:07:12 UTC (rev 32244)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/DefaultDecider.java	2010-03-26 16:13:44 UTC (rev 32245)
@@ -119,10 +119,13 @@
         undoMove.doMove(workingMemory);
         if (assertUndoMoveIsUncorrupted) {
             Score undoScore = moveScope.getStepScope().getLocalSearchSolverScope().calculateScoreFromWorkingMemory();
-            if (!undoScore.equals(moveScope.getStepScope().getLocalSearchSolverScope()
-                    .getLastCompletedStepScope().getScore())) {
+            Score lastCompletedStepScore = moveScope.getStepScope().getLocalSearchSolverScope()
+                    .getLastCompletedStepScope().getScore();
+            if (!undoScore.equals(lastCompletedStepScore)) {
                 throw new IllegalStateException(
-                        "Corrupted undo move (" + undoMove + ") received from move (" + move + ").");
+                        "Corrupted undo move (" + undoMove + ") received from move (" + move + ").\n"
+                        + "Unequal lastCompletedStepScore (" + lastCompletedStepScore + ") and undoScore ("
+                        + undoScore + ").");
             }
         }
         logger.debug("    Move ({}) with score ({}) and acceptChance ({}).",

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml	2010-03-26 16:07:12 UTC (rev 32244)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml	2010-03-26 16:13:44 UTC (rev 32245)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <localSearchSolver>
-    <!--<environmentMode>DEBUG</environmentMode>-->
+    <environmentMode>DEBUG</environmentMode>
     <scoreDrl>/org/drools/planner/examples/nqueens/solver/nQueensScoreRules.drl</scoreDrl>
     <scoreDefinition>
         <scoreDefinitionType>SIMPLE</scoreDefinitionType>

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml	2010-03-26 16:07:12 UTC (rev 32244)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml	2010-03-26 16:13:44 UTC (rev 32245)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <localSearchSolver>
+    <environmentMode>DEBUG</environmentMode>
     <scoreDrl>/org/drools/planner/examples/nqueens/solver/nQueensScoreRules.drl</scoreDrl>
     <scoreDefinition>
         <scoreDefinitionType>SIMPLE</scoreDefinitionType>