[jboss-svn-commits] JBL Code SVN: r33468 - labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score.

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

Author: ge0ffrey
Date: 2010-06-13 08:11:47 -0400 (Sun, 13 Jun 2010)
New Revision: 33468

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java
Log:
scores should always floor

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java	2010-06-13 11:51:42 UTC (rev 33467)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultHardAndSoftScore.java	2010-06-13 12:11:47 UTC (rev 33468)
@@ -68,13 +68,13 @@
     }
 
     public HardAndSoftScore multiply(double multiplicand) {
-        return new DefaultHardAndSoftScore((int) Math.round(this.hardScore * multiplicand),
-                (int) Math.round(this.softScore * multiplicand));
+        return new DefaultHardAndSoftScore((int) Math.floor(this.hardScore * multiplicand),
+                (int) Math.floor(this.softScore * multiplicand));
     }
 
     public HardAndSoftScore divide(double divisor) {
-        return new DefaultHardAndSoftScore((int) Math.round(this.hardScore / divisor),
-                (int) Math.round(this.softScore / divisor));
+        return new DefaultHardAndSoftScore((int) Math.floor(this.hardScore / divisor),
+                (int) Math.floor(this.softScore / divisor));
     }
 
     public boolean equals(Object o) {

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java	2010-06-13 11:51:42 UTC (rev 33467)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/DefaultSimpleScore.java	2010-06-13 12:11:47 UTC (rev 33468)
@@ -41,11 +41,11 @@
     }
 
     public SimpleScore multiply(double multiplicand) {
-        return new DefaultSimpleScore((int) Math.round(this.score * multiplicand));
+        return new DefaultSimpleScore((int) Math.floor(this.score * multiplicand));
     }
 
     public SimpleScore divide(double divisor) {
-        return new DefaultSimpleScore((int) Math.round(this.score / divisor));
+        return new DefaultSimpleScore((int) Math.floor(this.score / divisor));
     }
 
     public boolean equals(Object o) {

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java	2010-06-13 11:51:42 UTC (rev 33467)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/score/Score.java	2010-06-13 12:11:47 UTC (rev 33468)
@@ -11,9 +11,9 @@
 public interface Score<S extends Score> extends Comparable<S> {
 
     /**
-     * Returns a Score whose value is (this + augend).
+     * Returns a Score whose value is (this + augment).
      * @param augment value to be added to this Score
-     * @return this + augend
+     * @return this + augment
      */
     S add(S augment);
 
@@ -26,7 +26,7 @@
 
     /**
      * Returns a Score whose value is (this × multiplicand).
-     * Rounding will be applied as needed.
+     * When rounding is needed, it should be floored (as defined by {@link Math#floor(double)}.
      * @param multiplicand value to be multiplied by this Score.
      * @return this * multiplicand
      */
@@ -34,7 +34,7 @@
 
     /**
      * Returns a Score whose value is (this / divisor).
-     * Rounding will be applied as needed.
+     * When rounding is needed, it should be floored (as defined by {@link Math#floor(double)}.
      * @param divisor value by which this Score is to be divided
      * @return this / divisor
      */