[jboss-svn-commits] JBL Code SVN: r36114 - in labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core: score/definition and 1 other directory.

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

Author: ge0ffrey
Date: 2010-11-29 11:39:49 -0500 (Mon, 29 Nov 2010)
New Revision: 36114

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/acceptor/greatdeluge/GreatDelugeAcceptorTest.java
   labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java
Log:
fix testcases

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/acceptor/greatdeluge/GreatDelugeAcceptorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/acceptor/greatdeluge/GreatDelugeAcceptorTest.java	2010-11-29 16:02:38 UTC (rev 36113)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/acceptor/greatdeluge/GreatDelugeAcceptorTest.java	2010-11-29 16:39:49 UTC (rev 36114)
@@ -53,9 +53,9 @@
         MoveScope c1 = createMoveScope(stepScope, DefaultSimpleScore.valueOf(-1100));
         MoveScope c2 = createMoveScope(stepScope, DefaultSimpleScore.valueOf(-120));
         // Do stuff
-        assertEquals(0.0, acceptor.calculateAcceptChance(a1));
-        assertEquals(0.0, acceptor.calculateAcceptChance(a2));
-        assertEquals(1.0, acceptor.calculateAcceptChance(a3));
+        assertEquals(0.0, acceptor.calculateAcceptChance(a1), 0.0);
+        assertEquals(0.0, acceptor.calculateAcceptChance(a2), 0.0);
+        assertEquals(1.0, acceptor.calculateAcceptChance(a3), 0.0);
         // TODO reable a thorough test of great deluge
 //        acceptor.stepTaken(stepScope);
 //        assertEquals(0.0, acceptor.calculateAcceptChance(b1));

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java	2010-11-29 16:02:38 UTC (rev 36113)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/score/definition/HardAndSoftScoreDefinitionTest.java	2010-11-29 16:39:49 UTC (rev 36114)
@@ -35,56 +35,56 @@
         // Smack in the middle
         assertEquals(0.6, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-14,-340)));
+                DefaultHardAndSoftScore.valueOf(-14,-340)), 0.0);
         // No hard broken, total soft broken
         assertEquals(0.75, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-10,-400)));
+                DefaultHardAndSoftScore.valueOf(-10,-400)), 0.0);
         // Total hard broken, no soft broken
         assertEquals(0.25, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-20,-300)));
+                DefaultHardAndSoftScore.valueOf(-20,-300)), 0.0);
         // No hard broken, more than total soft broken
         assertEquals(0.75, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-10,-900)));
+                DefaultHardAndSoftScore.valueOf(-10,-900)), 0.0);
         // More than total hard broken, no soft broken
         assertEquals(0.0, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-90,-300)));
+                DefaultHardAndSoftScore.valueOf(-90,-300)), 0.0);
 
         // Perfect min/max cases
         assertEquals(1.0, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-10,-300), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-10,-300)));
+                DefaultHardAndSoftScore.valueOf(-10,-300)), 0.0);
         assertEquals(0.0, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-20,-400)));
+                DefaultHardAndSoftScore.valueOf(-20,-400)), 0.0);
         assertEquals(1.0, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-10,-300)));
+                DefaultHardAndSoftScore.valueOf(-10,-300)), 0.0);
 
         // Hard total delta is 0
         assertEquals(0.6, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-10,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-10,-340)));
+                DefaultHardAndSoftScore.valueOf(-10,-340)), 0.0);
         assertEquals(0.0, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-10,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-20,-340)));
+                DefaultHardAndSoftScore.valueOf(-20,-340)), 0.0);
         assertEquals(1.0, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-10,-400), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-0,-340)));
+                DefaultHardAndSoftScore.valueOf(-0,-340)), 0.0);
 
         // Soft total delta is 0
         assertEquals((0.6 * 0.75) + 0.25, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-300), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-14,-300)));
+                DefaultHardAndSoftScore.valueOf(-14,-300)), 0.0);
         assertEquals(0.6 * 0.75, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-300), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-14,-400)));
+                DefaultHardAndSoftScore.valueOf(-14,-400)), 0.0);
         assertEquals((0.6 * 0.75) + 0.25, scoreDefinition.calculateTimeGradient(
                 DefaultHardAndSoftScore.valueOf(-20,-300), DefaultHardAndSoftScore.valueOf(-10,-300),
-                DefaultHardAndSoftScore.valueOf(-14,-0)));
+                DefaultHardAndSoftScore.valueOf(-14,-0)), 0.0);
     }
 
 }