[jboss-svn-commits] JBL Code SVN: r26712 - in labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider: deciderscorecomparator and 1 other directory.

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

Author: ge0ffrey
Date: 2009-05-24 11:41:19 -0400 (Sun, 24 May 2009)
New Revision: 26712

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java
Log:
decider score comparator: bugfix so it works

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java	2009-05-24 15:04:41 UTC (rev 26711)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java	2009-05-24 15:41:19 UTC (rev 26712)
@@ -78,13 +78,13 @@
 
     public void beforeDeciding(StepScope stepScope) {
         deciderScoreComparatorFactory.beforeDeciding(stepScope);
+        stepScope.setDeciderScoreComparator(deciderScoreComparatorFactory.createDeciderScoreComparator());
         selector.beforeDeciding(stepScope);
         accepter.beforeDeciding(stepScope);
         forager.beforeDeciding(stepScope);
     }
 
     public void decideNextStep(StepScope stepScope) {
-        stepScope.setDeciderScoreComparator(deciderScoreComparatorFactory.createDeciderScoreComparator());
         WorkingMemory workingMemory = stepScope.getWorkingMemory();
         List<Move> moveList = selector.selectMoveList(stepScope);
         for (Move move : moveList) {

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java	2009-05-24 15:04:41 UTC (rev 26711)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java	2009-05-24 15:41:19 UTC (rev 26712)
@@ -93,12 +93,12 @@
                     if (successiveNoHardScoreChange == min) {
                         hardWeight = startingHardWeight;
                     } else {
-                        hardWeight *= hardWeightSurvivalRatio;
+                        hardWeight = (int) Math.round(((double) hardWeight) * hardWeightSurvivalRatio);
                     }
                     break;
                 }
-                min *= successiveNoHardChangeRepetitionMultiplicand;
-                max *= successiveNoHardChangeRepetitionMultiplicand;
+                min = (int) Math.round(((double) min) * successiveNoHardChangeRepetitionMultiplicand);
+                max = (int) Math.round(((double) max) * successiveNoHardChangeRepetitionMultiplicand);
             }
         }
     }