[jboss-svn-commits] JBL Code SVN: r16299 - in labs/jbossrules/trunk/drools-solver: drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/forager and 1 other directories.

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

Author: ge0ffrey
Date: 2007-11-03 13:57:08 -0400 (Sat, 03 Nov 2007)
New Revision: 16299

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/accepter/AccepterConfig.java
   labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/forager/ForagerConfig.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml
Log:
trying simulated annealing

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/accepter/AccepterConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/accepter/AccepterConfig.java	2007-11-03 16:28:36 UTC (rev 16298)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/accepter/AccepterConfig.java	2007-11-03 17:57:08 UTC (rev 16299)
@@ -7,6 +7,7 @@
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import org.drools.solver.core.localsearch.decider.accepter.Accepter;
 import org.drools.solver.core.localsearch.decider.accepter.CompositeAccepter;
+import org.drools.solver.core.localsearch.decider.accepter.simulatedannealing.SimulatedAnnealingAccepter;
 import org.drools.solver.core.localsearch.decider.accepter.tabu.MoveTabuAccepter;
 import org.drools.solver.core.localsearch.decider.accepter.tabu.PropertyTabuAccepter;
 import org.drools.solver.core.localsearch.decider.accepter.tabu.SolutionTabuAccepter;
@@ -187,6 +188,13 @@
             }
             accepterList.add(solutionTabuAccepter);
         }
+        if ((accepterTypeList != null && accepterTypeList.contains(AccepterType.SIMULATED_ANNEALING))) {
+            SimulatedAnnealingAccepter simulatedAnnealingAccepter = new SimulatedAnnealingAccepter();
+            accepterList.add(simulatedAnnealingAccepter);
+        }
+        if ((accepterTypeList != null && accepterTypeList.contains(AccepterType.GREAT_DELUGE))) {
+            throw new UnsupportedOperationException();
+        }
         
         if (accepterList.size() == 1) {
             return accepterList.get(0);

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/forager/ForagerConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/forager/ForagerConfig.java	2007-11-03 16:28:36 UTC (rev 16298)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/decider/forager/ForagerConfig.java	2007-11-03 17:57:08 UTC (rev 16299)
@@ -1,6 +1,7 @@
 package org.drools.solver.config.localsearch.decider.forager;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import org.drools.solver.core.localsearch.decider.forager.FirstRandomlyAcceptedForager;
 import org.drools.solver.core.localsearch.decider.forager.Forager;
 import org.drools.solver.core.localsearch.decider.forager.MaxScoreOfAllForager;
 
@@ -59,6 +60,8 @@
             switch (foragerType) {
                 case MAX_SCORE_OF_ALL:
                     return new MaxScoreOfAllForager();
+                case FIRST_RANDOMLY_ACCEPTED:
+                    return new FirstRandomlyAcceptedForager();
                 default:
                     throw new IllegalStateException("foragerType (" + foragerType + ") not implemented");
             }
@@ -76,7 +79,8 @@
     }
 
     public static enum ForagerType {
-        MAX_SCORE_OF_ALL
+        MAX_SCORE_OF_ALL,
+        FIRST_RANDOMLY_ACCEPTED
     }
 
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml	2007-11-03 16:28:36 UTC (rev 16298)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml	2007-11-03 17:57:08 UTC (rev 16299)
@@ -9,13 +9,21 @@
         <!--<maximumStepCount>100</maximumStepCount>-->
     </finish>
     <selector>
-        <moveFactoryClass>org.drools.solver.examples.itc2007.examination.solver.ExaminationMoveFactory</moveFactoryClass>
+        <moveFactory class="org.drools.solver.examples.itc2007.examination.solver.ExaminationMoveFactory">
+            <shuffleListEveryStep>true</shuffleListEveryStep>
+        </moveFactory>
     </selector>
+    <!--<accepter>-->
+        <!--<completeSolutionTabuSize>1500</completeSolutionTabuSize>-->
+    <!--</accepter>-->
+    <!--<forager>-->
+        <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+    <!--</forager>-->
     <accepter>
-        <completeSolutionTabuSize>1500</completeSolutionTabuSize>
+        <accepterType>SIMULATED_ANNEALING</accepterType>
     </accepter>
     <forager>
-        <foragerType>MAX_SCORE_OF_ALL</foragerType>
+        <foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>
     </forager>
 </localSearchSolver>
         
\ No newline at end of file