[jboss-svn-commits] JBL Code SVN: r26710 - in labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core: score/comparator and 1 other directory.

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

Author: ge0ffrey
Date: 2009-05-24 10:11:07 -0400 (Sun, 24 May 2009)
New Revision: 26710

Added:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/FlatteningHardAndSoftScoreComparator.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/NaturalScoreComparator.java
Removed:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparator.java
Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.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: move and rename score comparators

Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparator.java	2009-05-24 13:47:49 UTC (rev 26709)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparator.java	2009-05-24 14:11:07 UTC (rev 26710)
@@ -1,17 +0,0 @@
-package org.drools.solver.core.localsearch.decider.deciderscorecomparator;
-
-import java.util.Comparator;
-
-import org.drools.solver.core.score.Score;
-
-/**
- * Compares by the natural order of scores.
- * @author Geoffrey De Smet
- */
-public class NaturalDeciderScoreComparator implements Comparator<Score> {
-
-    public int compare(Score score1, Score score2) {
-        return score1.compareTo(score2);
-    }
-
-}

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java	2009-05-24 13:47:49 UTC (rev 26709)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparatorFactory.java	2009-05-24 14:11:07 UTC (rev 26710)
@@ -3,6 +3,7 @@
 import java.util.Comparator;
 
 import org.drools.solver.core.score.Score;
+import org.drools.solver.core.score.comparator.NaturalScoreComparator;
 
 /**
  * Implementation of {@link DeciderScoreComparatorFactory}.
@@ -12,7 +13,7 @@
  */
 public class NaturalDeciderScoreComparatorFactory extends AbstractDeciderScoreComparatorFactory {
 
-    private Comparator<Score> naturalDeciderScoreComparator = new NaturalDeciderScoreComparator();
+    private Comparator<Score> naturalDeciderScoreComparator = new NaturalScoreComparator();
 
     public Comparator<Score> createDeciderScoreComparator() {
         return naturalDeciderScoreComparator;

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 13:47:49 UTC (rev 26709)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/ShiftingHardPenaltyDeciderScoreComparatorFactory.java	2009-05-24 14:11:07 UTC (rev 26710)
@@ -6,6 +6,7 @@
 import org.drools.solver.core.localsearch.LocalSearchSolverScope;
 import org.drools.solver.core.score.HardAndSoftScore;
 import org.drools.solver.core.score.Score;
+import org.drools.solver.core.score.comparator.NaturalScoreComparator;
 
 /**
  * Implementation of {@link HardAndSoftScore}.
@@ -27,7 +28,7 @@
     private boolean shiftingPenaltyActive;
     private int hardWeight;
 
-    private Comparator<Score> naturalDeciderScoreComparator = new NaturalDeciderScoreComparator();
+    private Comparator<Score> naturalDeciderScoreComparator = new NaturalScoreComparator();
 
     public void setHardScoreActivationThreshold(int hardScoreActivationThreshold) {
         this.hardScoreActivationThreshold = hardScoreActivationThreshold;

Copied: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/FlatteningHardAndSoftScoreComparator.java (from rev 26709, labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/HardPenaltyDeciderScoreComparator.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/FlatteningHardAndSoftScoreComparator.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/FlatteningHardAndSoftScoreComparator.java	2009-05-24 14:11:07 UTC (rev 26710)
@@ -0,0 +1,28 @@
+package org.drools.solver.core.score.comparator;
+
+import java.util.Comparator;
+
+import org.drools.solver.core.score.Score;
+import org.drools.solver.core.score.HardAndSoftScore;
+
+/**
+ * Compares 2 HardAndSoftScore after flattening: the hard multiplied by a hardWeight gets added to the soft.
+* @author Geoffrey De Smet
+*/
+public class FlatteningHardAndSoftScoreComparator implements Comparator<Score> {
+
+    private int hardWeight;
+
+    public FlatteningHardAndSoftScoreComparator(int hardWeight) {
+        this.hardWeight = hardWeight;
+    }
+
+    public int compare(Score s1, Score s2) {
+        HardAndSoftScore score1 = (HardAndSoftScore) s1;
+        HardAndSoftScore score2 = (HardAndSoftScore) s2;
+        int score1Side = score1.getHardScore() * hardWeight + score1.getSoftScore();
+        int score2Side = score2.getHardScore() * hardWeight + score2.getSoftScore();
+        return score1Side < score2Side ? -1 : (score1Side == score2Side ? 0 : 1);
+    }
+
+}
\ No newline at end of file

Copied: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/NaturalScoreComparator.java (from rev 26709, labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/deciderscorecomparator/NaturalDeciderScoreComparator.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/NaturalScoreComparator.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/score/comparator/NaturalScoreComparator.java	2009-05-24 14:11:07 UTC (rev 26710)
@@ -0,0 +1,17 @@
+package org.drools.solver.core.score.comparator;
+
+import java.util.Comparator;
+
+import org.drools.solver.core.score.Score;
+
+/**
+ * Compares by the natural order of scores.
+ * @author Geoffrey De Smet
+ */
+public class NaturalScoreComparator implements Comparator<Score> {
+
+    public int compare(Score score1, Score score2) {
+        return score1.compareTo(score2);
+    }
+
+}