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

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

Author: ge0ffrey
Date: 2009-06-29 01:59:45 -0400 (Mon, 29 Jun 2009)
New Revision: 27275

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleSolverConfig.xml
Log:
pas: latest configurations

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml	2009-06-29 05:47:15 UTC (rev 27274)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml	2009-06-29 05:59:45 UTC (rev 27275)
@@ -21,44 +21,19 @@
         <finish>
             <maximumMinutesSpend>60</maximumMinutesSpend>
         </finish>
-        <!--<deciderScoreComparatorFactory>-->
-            <!--<deciderScoreComparatorFactoryType>SHIFTING_HARD_PENALTY</deciderScoreComparatorFactoryType>-->
-            <!--<hardScoreActivationThreshold>0</hardScoreActivationThreshold>-->
-            <!--<successiveNoHardChangeMinimum>2</successiveNoHardChangeMinimum>-->
-            <!--<successiveNoHardChangeMaximum>20</successiveNoHardChangeMaximum>-->
-            <!--<successiveNoHardChangeRepetitionMultiplicand>20.0</successiveNoHardChangeRepetitionMultiplicand>-->
-            <!--<hardWeightSurvivalRatio>0.2</hardWeightSurvivalRatio>-->
-            <!--<startingHardWeight>1000</startingHardWeight>-->
-        <!--</deciderScoreComparatorFactory>-->
-        <selector>
-            <selector>
-                <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
-                <relativeSelection>0.002</relativeSelection>
-            </selector>
-            <selector>
-                <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
-                <relativeSelection>0.002</relativeSelection>
-            </selector>
-        </selector>
-        <accepter>
-            <completeSolutionTabuSize>1000</completeSolutionTabuSize>
-            <completePropertyTabuSize>7</completePropertyTabuSize>
-        </accepter>
-        <forager>
-            <foragerType>FIRST_BEST_SCORE_IMPROVING</foragerType>
-        </forager>
     </inheritedLocalSearchSolver>
 
     <solverBenchmark>
+        <name>basis</name>
         <localSearchSolver>
             <selector>
                 <selector>
                     <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
+                    <relativeSelection>0.0004</relativeSelection>
                 </selector>
                 <selector>
                     <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
+                    <relativeSelection>0.0004</relativeSelection>
                 </selector>
             </selector>
             <accepter>
@@ -70,6 +45,7 @@
         </localSearchSolver>
     </solverBenchmark>
     <solverBenchmark>
+        <name>first_best_score_improving</name>
         <localSearchSolver>
             <selector>
                 <selector>
@@ -85,24 +61,67 @@
                 <completeSolutionTabuSize>1000</completeSolutionTabuSize>
             </accepter>
             <forager>
+                <foragerType>FIRST_BEST_SCORE_IMPROVING</foragerType>
+            </forager>
+        </localSearchSolver>
+    </solverBenchmark>
+    <solverBenchmark>
+        <name>relativeSelection less</name>
+        <localSearchSolver>
+            <selector>
+                <selector>
+                    <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.0002</relativeSelection>
+                </selector>
+                <selector>
+                    <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.0002</relativeSelection>
+                </selector>
+            </selector>
+            <accepter>
+                <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+            </accepter>
+            <forager>
                 <foragerType>MAX_SCORE_OF_ALL</foragerType>
             </forager>
         </localSearchSolver>
     </solverBenchmark>
     <solverBenchmark>
+        <name>relativeSelection more</name>
         <localSearchSolver>
             <selector>
                 <selector>
                     <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
+                    <relativeSelection>0.0008</relativeSelection>
                 </selector>
                 <selector>
                     <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
+                    <relativeSelection>0.0008</relativeSelection>
                 </selector>
             </selector>
             <accepter>
                 <completeSolutionTabuSize>1000</completeSolutionTabuSize>
+            </accepter>
+            <forager>
+                <foragerType>MAX_SCORE_OF_ALL</foragerType>
+            </forager>
+        </localSearchSolver>
+    </solverBenchmark>
+    <solverBenchmark>
+        <name>completePropertyTabuSize 7</name>
+        <localSearchSolver>
+            <selector>
+                <selector>
+                    <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.0004</relativeSelection>
+                </selector>
+                <selector>
+                    <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
+                    <relativeSelection>0.0004</relativeSelection>
+                </selector>
+            </selector>
+            <accepter>
+                <completeSolutionTabuSize>1000</completeSolutionTabuSize>
                 <completePropertyTabuSize>7</completePropertyTabuSize>
             </accepter>
             <forager>
@@ -111,6 +130,7 @@
         </localSearchSolver>
     </solverBenchmark>
     <solverBenchmark>
+        <name>shifting_hard_penalty</name>
         <localSearchSolver>
             <deciderScoreComparatorFactory>
                 <deciderScoreComparatorFactoryType>SHIFTING_HARD_PENALTY</deciderScoreComparatorFactoryType>
@@ -119,16 +139,16 @@
                 <successiveNoHardChangeMaximum>20</successiveNoHardChangeMaximum>
                 <successiveNoHardChangeRepetitionMultiplicand>20.0</successiveNoHardChangeRepetitionMultiplicand>
                 <hardWeightSurvivalRatio>0.2</hardWeightSurvivalRatio>
-                <startingHardWeight>200</startingHardWeight>
+                <startingHardWeight>1000</startingHardWeight>
             </deciderScoreComparatorFactory>
             <selector>
                 <selector>
                     <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
+                    <relativeSelection>0.0004</relativeSelection>
                 </selector>
                 <selector>
                     <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
-                    <relativeSelection>0.002</relativeSelection>
+                    <relativeSelection>0.0004</relativeSelection>
                 </selector>
             </selector>
             <accepter>

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleSolverConfig.xml	2009-06-29 05:47:15 UTC (rev 27274)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/patientadmissionschedule/solver/patientAdmissionScheduleSolverConfig.xml	2009-06-29 05:59:45 UTC (rev 27275)
@@ -8,23 +8,14 @@
     <finish>
         <maximumMinutesSpend>5</maximumMinutesSpend>
     </finish>
-    <!--<deciderScoreComparatorFactory>-->
-        <!--<deciderScoreComparatorFactoryType>SHIFTING_HARD_PENALTY</deciderScoreComparatorFactoryType>-->
-        <!--<hardScoreActivationThreshold>0</hardScoreActivationThreshold>-->
-        <!--<successiveNoHardChangeMinimum>2</successiveNoHardChangeMinimum>-->
-        <!--<successiveNoHardChangeMaximum>20</successiveNoHardChangeMaximum>-->
-        <!--<successiveNoHardChangeRepetitionMultiplicand>20.0</successiveNoHardChangeRepetitionMultiplicand>-->
-        <!--<hardWeightSurvivalRatio>0.2</hardWeightSurvivalRatio>-->
-        <!--<startingHardWeight>1000</startingHardWeight>-->
-    <!--</deciderScoreComparatorFactory>-->
     <selector>
         <selector>
             <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedChangeMoveFactory</moveFactoryClass>
-            <relativeSelection>0.002</relativeSelection>
+            <relativeSelection>0.0004</relativeSelection>
         </selector>
         <selector>
             <moveFactoryClass>org.drools.solver.examples.patientadmissionschedule.solver.move.factory.BedDesignationSwitchMoveFactory</moveFactoryClass>
-            <relativeSelection>0.002</relativeSelection>
+            <relativeSelection>0.0004</relativeSelection>
         </selector>
     </selector>
     <accepter>
@@ -32,7 +23,7 @@
         <completePropertyTabuSize>7</completePropertyTabuSize>
     </accepter>
     <forager>
-        <foragerType>FIRST_BEST_SCORE_IMPROVING</foragerType>
+        <foragerType>MAX_SCORE_OF_ALL</foragerType>
     </forager>
 </localSearchSolver>
         
\ No newline at end of file