[jboss-svn-commits] JBL Code SVN: r15457 - in labs/jbossrules/trunk/drools-solver: drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator and 1 other directories.

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

Author: ge0ffrey
Date: 2007-09-30 10:22:16 -0400 (Sun, 30 Sep 2007)
New Revision: 15457

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/evaluation/scorecalculator/ScoreCalculatorConfig.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/DynamicHardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
Log:
fix dynamic hard and soft constraints stuff

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/evaluation/scorecalculator/ScoreCalculatorConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/evaluation/scorecalculator/ScoreCalculatorConfig.java	2007-09-30 11:13:28 UTC (rev 15456)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/evaluation/scorecalculator/ScoreCalculatorConfig.java	2007-09-30 14:22:16 UTC (rev 15457)
@@ -64,7 +64,7 @@
                 case HARD_AND_SOFT_CONSTRAINTS:
                     return new StaticHardAndSoftConstraintScoreCalculator();
                 case DYNAMIC_HARD_AND_SOFT_CONSTRAINTS:
-                    return new DynamicHardAndSoftConstraintScoreCalculator(10000.0, 1000000.0, 100.0, 1.2);
+                    return new DynamicHardAndSoftConstraintScoreCalculator(10000.0, 100.0, 1000000.0, 1.2);
                 default:
                     throw new IllegalStateException("scoreCalculatorType (" + scoreCalculatorType + ") not implemented");
             }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/DynamicHardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/DynamicHardAndSoftConstraintScoreCalculator.java	2007-09-30 11:13:28 UTC (rev 15456)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/DynamicHardAndSoftConstraintScoreCalculator.java	2007-09-30 14:22:16 UTC (rev 15457)
@@ -25,6 +25,14 @@
     public DynamicHardAndSoftConstraintScoreCalculator(double startHardConstraintsWeight,
             double minHardConstraintsWeight, double maxHardConstraintsWeight,
             double hardConstraintsWeightStepAdjustment) {
+        if (minHardConstraintsWeight > startHardConstraintsWeight) {
+            throw new IllegalArgumentException("minHardConstraintsWeight (" + minHardConstraintsWeight
+                    + ") cannot be larger than startHardConstraintsWeight(" + startHardConstraintsWeight + ").");
+        }
+        if (startHardConstraintsWeight > maxHardConstraintsWeight) {
+            throw new IllegalArgumentException("startHardConstraintsWeight (" + startHardConstraintsWeight
+                    + ") cannot be larger than maxHardConstraintsWeight(" + maxHardConstraintsWeight + ").");
+        }
         this.decisionHardConstraintsWeight = startHardConstraintsWeight;
         this.minHardConstraintsWeight = minHardConstraintsWeight;
         this.maxHardConstraintsWeight = maxHardConstraintsWeight;

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml	2007-09-30 11:13:28 UTC (rev 15456)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml	2007-09-30 14:22:16 UTC (rev 15457)
@@ -2,7 +2,7 @@
 <localSearchSolver>
     <scoreDrl>/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl</scoreDrl>
     <scoreCalculator>
-        <scoreCalculatorType>HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
+        <scoreCalculatorType>DYNAMIC_HARD_AND_SOFT_CONSTRAINTS</scoreCalculatorType>
     </scoreCalculator>
     <finish>
         <!--<maximumHouresSpend>2</maximumHouresSpend>-->