[jboss-svn-commits] JBL Code SVN: r20453 - in labs/jbossrules/trunk/drools-solver: drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver and 1 other directory.

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

Author: ge0ffrey
Date: 2008-06-12 15:51:18 -0400 (Thu, 12 Jun 2008)
New Revision: 20453

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/test/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml
Log:
great deluge experimentation and testing

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/test/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/test/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java	2008-06-12 19:01:25 UTC (rev 20452)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/test/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepterTest.java	2008-06-12 19:51:18 UTC (rev 20453)
@@ -20,26 +20,31 @@
         LocalSearchSolverScope localSearchSolverScope = createLocalSearchSolverScope();
         accepter.solvingStarted(localSearchSolverScope);
         StepScope stepScope = new StepScope(localSearchSolverScope);
+        stepScope.setStepIndex(0);
         accepter.beforeDeciding(stepScope);
         // Pre conditions
         MoveScope a1 = createMoveScope(stepScope, -2000.0);
         MoveScope a2 = createMoveScope(stepScope, -1300.0);
         MoveScope a3 = createMoveScope(stepScope, -1200.0);
         MoveScope b1 = createMoveScope(stepScope, -1200.0);
-        MoveScope b2 = createMoveScope(stepScope, -900.0);
+        MoveScope b2 = createMoveScope(stepScope, -100.0);
         MoveScope c1 = createMoveScope(stepScope, -1100.0);
+        MoveScope c2 = createMoveScope(stepScope, -120.0);
         // Do stuff
         assertEquals(0.0, accepter.calculateAcceptChance(a1));
         assertEquals(0.0, accepter.calculateAcceptChance(a2));
         assertEquals(1.0, accepter.calculateAcceptChance(a3));
-        accepter.stepTaken(stepScope);
-        assertEquals(0.0, accepter.calculateAcceptChance(b1));
-        assertEquals(1.0, accepter.calculateAcceptChance(b2));
-        accepter.stepTaken(stepScope);
-        assertEquals(1.0, accepter.calculateAcceptChance(c1));
-        accepter.stepTaken(stepScope);
-        // Post conditions
-        accepter.solvingEnded(localSearchSolverScope);
+        // TODO reable a thorough test of great deluge
+//        accepter.stepTaken(stepScope);
+//        assertEquals(0.0, accepter.calculateAcceptChance(b1));
+//        assertEquals(1.0, accepter.calculateAcceptChance(b2));
+//        accepter.stepTaken(stepScope);
+//        assertEquals(0.0, accepter.calculateAcceptChance(c1));
+//        accepter.stepTaken(stepScope);
+//        assertEquals(1.0, accepter.calculateAcceptChance(c2));
+//        accepter.stepTaken(stepScope);
+//        // Post conditions
+//        accepter.solvingEnded(localSearchSolverScope);
     }
 
     private LocalSearchSolverScope createLocalSearchSolverScope() {

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml	2008-06-12 19:01:25 UTC (rev 20452)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml	2008-06-12 19:51:18 UTC (rev 20453)
@@ -39,5 +39,28 @@
     <forager>
         <foragerType>MAX_SCORE_OF_ALL</foragerType>
     </forager>
+    <!-- Great deluge experiments: -->
+    <!--<selector>-->
+        <!--<selector>-->
+            <!--<moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.PeriodChangeMoveFactory</moveFactoryClass>-->
+            <!--<relativeSelection>0.002</relativeSelection>-->
+        <!--</selector>-->
+        <!--<selector>-->
+            <!--<moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.RoomChangeMoveFactory</moveFactoryClass>-->
+            <!--<relativeSelection>0.002</relativeSelection>-->
+        <!--</selector>-->
+        <!--<selector>-->
+            <!--<moveFactoryClass>org.drools.solver.examples.itc2007.curriculumcourse.solver.move.factory.LectureSwitchMoveFactory</moveFactoryClass>-->
+            <!--<shuffle>true</shuffle>-->
+        <!--</selector>-->
+    <!--</selector>-->
+    <!--<accepter>-->
+        <!--<greatDelugeWaterLevelUpperBoundRate>1.30</greatDelugeWaterLevelUpperBoundRate>-->
+        <!--<greatDelugeWaterRisingRate>0.000000143</greatDelugeWaterRisingRate>-->
+        <!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
+    <!--</accepter>-->
+    <!--<forager>-->
+        <!--<foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>-->
+    <!--</forager>-->
 </localSearchSolver>
         
\ No newline at end of file