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

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

Author: ge0ffrey
Date: 2007-11-11 13:53:37 -0500 (Sun, 11 Nov 2007)
New Revision: 16518

Added:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/
Removed:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/
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/EvaluationHandler.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/Move.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/AbstractHardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/AbstractScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/DynamicHardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/HardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/ScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/SimpleScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/StaticHardAndSoftConstraintScoreCalculator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl
Log:
move calculator to score package

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-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/evaluation/scorecalculator/ScoreCalculatorConfig.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,10 +1,10 @@
 package org.drools.solver.config.localsearch.evaluation.scorecalculator;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.drools.solver.core.evaluation.scorecalculator.DynamicHardAndSoftConstraintScoreCalculator;
-import org.drools.solver.core.evaluation.scorecalculator.ScoreCalculator;
-import org.drools.solver.core.evaluation.scorecalculator.SimpleScoreCalculator;
-import org.drools.solver.core.evaluation.scorecalculator.StaticHardAndSoftConstraintScoreCalculator;
+import org.drools.solver.core.score.calculator.DynamicHardAndSoftConstraintScoreCalculator;
+import org.drools.solver.core.score.calculator.ScoreCalculator;
+import org.drools.solver.core.score.calculator.SimpleScoreCalculator;
+import org.drools.solver.core.score.calculator.StaticHardAndSoftConstraintScoreCalculator;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/EvaluationHandler.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -2,7 +2,7 @@
 
 import org.drools.RuleBase;
 import org.drools.StatefulSession;
-import org.drools.solver.core.evaluation.scorecalculator.ScoreCalculator;
+import org.drools.solver.core.score.calculator.ScoreCalculator;
 import org.drools.solver.core.solution.Solution;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/Move.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/Move.java	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/Move.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -3,8 +3,8 @@
 import org.drools.FactHandle;
 import org.drools.WorkingMemory;
 import org.drools.solver.core.Solver;
-import org.drools.solver.core.evaluation.scorecalculator.ScoreCalculator;
 import org.drools.solver.core.localsearch.decider.selector.MoveFactory;
+import org.drools.solver.core.score.calculator.ScoreCalculator;
 import org.drools.solver.core.solution.Solution;
 
 /**

Copied: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator (from rev 16463, labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator)

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/AbstractHardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/AbstractHardAndSoftConstraintScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/AbstractHardAndSoftConstraintScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/AbstractScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/AbstractScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/AbstractScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * Makes it easier to implement a ScoreCalculator.

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/DynamicHardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/DynamicHardAndSoftConstraintScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/DynamicHardAndSoftConstraintScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/HardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/HardAndSoftConstraintScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/HardAndSoftConstraintScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/ScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/ScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/ScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * Evaluates a solution based on its WorkingMemory (which is part of the rule production system).

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/SimpleScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/SimpleScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/SimpleScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/StaticHardAndSoftConstraintScoreCalculator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/evaluation/scorecalculator/StaticHardAndSoftConstraintScoreCalculator.java	2007-11-09 12:53:26 UTC (rev 16463)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/calculator/StaticHardAndSoftConstraintScoreCalculator.java	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,4 +1,4 @@
-package org.drools.solver.core.evaluation.scorecalculator;
+package org.drools.solver.core.score.calculator;
 
 /**
  * @author Geoffrey De Smet

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationScoreRules.drl	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,7 +1,7 @@
 package org.drools.solver.examples.itc2007.examination.solver;
     dialect "java"
 
-import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
+import org.drools.solver.core.score.calculator.HardAndSoftConstraintScoreCalculator;
 
 import org.drools.solver.examples.itc2007.examination.domain.Exam;
 import org.drools.solver.examples.itc2007.examination.domain.Examination;

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/lessonschedule/solver/lessonScheduleScoreRules.drl	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,6 +1,6 @@
 package rg.drools.solver.examples.lessonschedule.solver;
 
-import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
+import org.drools.solver.core.score.calculator.HardAndSoftConstraintScoreCalculator;
 
 import org.drools.solver.examples.lessonschedule.domain.LessonSchedule;
 import org.drools.solver.examples.lessonschedule.domain.Timeslot;

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nQueensScoreRules.drl	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,6 +1,6 @@
 package org.drools.solver.examples.nqueens.solver;
 
-import org.drools.solver.core.evaluation.scorecalculator.SimpleScoreCalculator;
+import org.drools.solver.core.score.calculator.SimpleScoreCalculator;
 
 import org.drools.solver.examples.nqueens.domain.Queen;
 import org.drools.solver.core.score.constraint.ConstraintOccurrence;

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/simple/simpleTravelingTournamentScoreRules.drl	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,7 +1,7 @@
 package org.drools.solver.examples.travelingtournament.simple.solver;
     dialect "java"
 
-import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
+import org.drools.solver.core.score.calculator.HardAndSoftConstraintScoreCalculator;
 
 import org.drools.solver.examples.travelingtournament.domain.Match;
 import org.drools.solver.examples.travelingtournament.domain.Day;

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl	2007-11-11 18:46:47 UTC (rev 16517)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentScoreRules.drl	2007-11-11 18:53:37 UTC (rev 16518)
@@ -1,7 +1,7 @@
 package org.drools.solver.examples.travelingtournament.smart.solver;
     dialect "java"
 
-import org.drools.solver.core.evaluation.scorecalculator.HardAndSoftConstraintScoreCalculator;
+import org.drools.solver.core.score.calculator.HardAndSoftConstraintScoreCalculator;
 
 import org.drools.solver.examples.travelingtournament.domain.Match;
 import org.drools.solver.examples.travelingtournament.domain.Day;