[jboss-svn-commits] JBL Code SVN: r33656 - in labs/jbossrules/trunk: drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration and 22 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jun 26 12:12:06 EDT 2010
Author: ge0ffrey
Date: 2010-06-26 12:12:05 -0400 (Sat, 26 Jun 2010)
New Revision: 33656
Added:
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyType.java
Removed:
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java
Modified:
labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml
labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Chapter-Planner_configuration.xml
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java
labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/lessonschedule/solver/lessonScheduleSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/manners2009/solver/manners2009SolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionLongSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionSprintSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml
labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
Log:
ForagerType has been renamed to the PickEarlyType
Modified: labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Benchmarking_and_tweaking/Chapter-Benchmarking_and_tweaking.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -49,7 +49,7 @@
<moveFactoryClass>org.drools.planner.examples.nqueens.solver.move.factory.NQueensMoveFactory</moveFactoryClass>
</selector>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</inheritedLocalSearchSolver>
Modified: labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Chapter-Planner_configuration.xml
===================================================================
--- labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Chapter-Planner_configuration.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-docs/drools-docs-planner/src/main/docbook/en-US/Chapter-Planner_configuration/Chapter-Planner_configuration.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -266,7 +266,7 @@
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver></programlisting>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/deciderscorecomparator/DeciderScoreComparatorFactoryConfig.java 2010-06-26 16:12:05 UTC (rev 33656)
@@ -29,14 +29,6 @@
this.deciderScoreComparatorClass = deciderScoreComparatorClass;
}
- public DeciderScoreComparatorFactoryType getForagerType() {
- return deciderScoreComparatorFactoryType;
- }
-
- public void setForagerType(DeciderScoreComparatorFactoryType deciderScoreComparatorFactoryType) {
- this.deciderScoreComparatorFactoryType = deciderScoreComparatorFactoryType;
- }
-
public DeciderScoreComparatorFactoryType getDeciderScoreComparatorFactoryType() {
return deciderScoreComparatorFactoryType;
}
@@ -147,7 +139,7 @@
public void inherit(DeciderScoreComparatorFactoryConfig inheritedConfig) {
if (deciderScoreComparatorClass == null && deciderScoreComparatorFactoryType == null) {
deciderScoreComparatorClass = inheritedConfig.getDeciderScoreComparatorClass();
- deciderScoreComparatorFactoryType = inheritedConfig.getForagerType();
+ deciderScoreComparatorFactoryType = inheritedConfig.getDeciderScoreComparatorFactoryType();
}
if (hardScoreActivationThreshold == null) {
hardScoreActivationThreshold = inheritedConfig.getHardScoreActivationThreshold();
@@ -175,4 +167,4 @@
SHIFTING_HARD_PENALTY
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/config/localsearch/decider/forager/ForagerConfig.java 2010-06-26 16:12:05 UTC (rev 33656)
@@ -3,7 +3,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.drools.planner.core.localsearch.decider.forager.AcceptedForager;
import org.drools.planner.core.localsearch.decider.forager.Forager;
-import org.drools.planner.core.localsearch.decider.forager.PickEarlyByScore;
+import org.drools.planner.core.localsearch.decider.forager.PickEarlyType;
/**
* @author Geoffrey De Smet
@@ -13,7 +13,7 @@
private Forager forager = null; // TODO remove this and document extending ForagerConfig
private Class<Forager> foragerClass = null;
- private ForagerType foragerType = null;
+ private PickEarlyType pickEarlyType = null;
protected Integer minimalAcceptedSelection = null;
@@ -33,12 +33,12 @@
this.foragerClass = foragerClass;
}
- public ForagerType getForagerType() {
- return foragerType;
+ public PickEarlyType getPickEarlyType() {
+ return pickEarlyType;
}
- public void setForagerType(ForagerType foragerType) {
- this.foragerType = foragerType;
+ public void setPickEarlyType(PickEarlyType pickEarlyType) {
+ this.pickEarlyType = pickEarlyType;
}
public Integer getMinimalAcceptedSelection() {
@@ -67,47 +67,20 @@
+ ") does not have a public no-arg constructor", e);
}
}
- PickEarlyByScore pickEarlyByScore;
- if (foragerType != null) {
- switch (foragerType) {
- case MAX_SCORE_OF_ALL:
- pickEarlyByScore = PickEarlyByScore.NONE;
- break;
- case FIRST_BEST_SCORE_IMPROVING:
- pickEarlyByScore = PickEarlyByScore.FIRST_BEST_SCORE_IMPROVING;
- break;
- case FIRST_LAST_STEP_SCORE_IMPROVING:
- pickEarlyByScore = PickEarlyByScore.FIRST_LAST_STEP_SCORE_IMPROVING;
- break;
- case FIRST_RANDOMLY_ACCEPTED:
- pickEarlyByScore = PickEarlyByScore.NONE;
- break;
- default:
- throw new IllegalStateException("The foragerType (" + foragerType + ") is not implemented");
- }
- } else {
- pickEarlyByScore = PickEarlyByScore.NONE;
- }
+ PickEarlyType pickEarlyType = (this.pickEarlyType == null) ? PickEarlyType.NEVER : this.pickEarlyType;
int minimalAcceptedSelection = (this.minimalAcceptedSelection == null)
? Integer.MAX_VALUE : this.minimalAcceptedSelection;
- return new AcceptedForager(pickEarlyByScore, minimalAcceptedSelection);
+ return new AcceptedForager(pickEarlyType, minimalAcceptedSelection);
}
public void inherit(ForagerConfig inheritedConfig) {
- if (forager == null && foragerClass == null && foragerType == null && minimalAcceptedSelection == null) {
+ if (forager == null && foragerClass == null && pickEarlyType == null && minimalAcceptedSelection == null) {
forager = inheritedConfig.getForager();
foragerClass = inheritedConfig.getForagerClass();
- foragerType = inheritedConfig.getForagerType();
+ pickEarlyType = inheritedConfig.getPickEarlyType();
minimalAcceptedSelection = inheritedConfig.getMinimalAcceptedSelection();
}
}
- public static enum ForagerType {
- MAX_SCORE_OF_ALL,
- FIRST_BEST_SCORE_IMPROVING,
- FIRST_LAST_STEP_SCORE_IMPROVING,
- FIRST_RANDOMLY_ACCEPTED
- }
-
}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForager.java 2010-06-26 16:12:05 UTC (rev 33656)
@@ -20,7 +20,7 @@
public class AcceptedForager extends AbstractForager {
// final to allow better hotspot optimization. TODO prove that it indeed makes a difference
- protected final PickEarlyByScore pickEarlyByScore;
+ protected final PickEarlyType pickEarlyType;
protected final int minimalAcceptedSelection;
protected AcceptedMoveScopeComparator acceptedMoveScopeComparator;
@@ -33,8 +33,8 @@
protected MoveScope earlyPickedMoveScope = null;
- public AcceptedForager(PickEarlyByScore pickEarlyByScore, int minimalAcceptedSelection) {
- this.pickEarlyByScore = pickEarlyByScore;
+ public AcceptedForager(PickEarlyType pickEarlyType, int minimalAcceptedSelection) {
+ this.pickEarlyType = pickEarlyType;
this.minimalAcceptedSelection = minimalAcceptedSelection;
}
@@ -62,8 +62,8 @@
}
protected void checkPickEarly(MoveScope moveScope) {
- switch (pickEarlyByScore) {
- case NONE:
+ switch (pickEarlyType) {
+ case NEVER:
break;
case FIRST_BEST_SCORE_IMPROVING:
if (moveScope.getStepScope().getDeciderScoreComparator().compare(moveScope.getScore(),
@@ -79,7 +79,7 @@
}
break;
default:
- throw new IllegalStateException("The pickEarlyByScore (" + pickEarlyByScore + ") is not implemented");
+ throw new IllegalStateException("The pickEarlyType (" + pickEarlyType + ") is not implemented");
}
}
Deleted: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java 2010-06-26 16:12:05 UTC (rev 33656)
@@ -1,10 +0,0 @@
-package org.drools.planner.core.localsearch.decider.forager;
-
-/**
- * @author Geoffrey De Smet
- */
-public enum PickEarlyByScore {
- NONE,
- FIRST_BEST_SCORE_IMPROVING,
- FIRST_LAST_STEP_SCORE_IMPROVING;
-}
Copied: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyType.java (from rev 33650, labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyByScore.java)
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyType.java (rev 0)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/main/java/org/drools/planner/core/localsearch/decider/forager/PickEarlyType.java 2010-06-26 16:12:05 UTC (rev 33656)
@@ -0,0 +1,10 @@
+package org.drools.planner.core.localsearch.decider.forager;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public enum PickEarlyType {
+ NEVER,
+ FIRST_BEST_SCORE_IMPROVING,
+ FIRST_LAST_STEP_SCORE_IMPROVING;
+}
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/src/test/java/org/drools/planner/core/localsearch/decider/forager/AcceptedForagerTest.java 2010-06-26 16:12:05 UTC (rev 33656)
@@ -25,7 +25,7 @@
public void testPickMoveMaxScoreOfAll() {
// Setup
- Forager forager = new AcceptedForager(PickEarlyByScore.NONE, Integer.MAX_VALUE);
+ Forager forager = new AcceptedForager(PickEarlyType.NEVER, Integer.MAX_VALUE);
LocalSearchSolverScope localSearchSolverScope = createLocalSearchSolverScope();
forager.solvingStarted(localSearchSolverScope);
StepScope stepScope = createStepScope(localSearchSolverScope);
@@ -61,7 +61,7 @@
public void testPickMoveFirstBestScoreImproving() {
// Setup
- Forager forager = new AcceptedForager(PickEarlyByScore.FIRST_BEST_SCORE_IMPROVING, Integer.MAX_VALUE);
+ Forager forager = new AcceptedForager(PickEarlyType.FIRST_BEST_SCORE_IMPROVING, Integer.MAX_VALUE);
LocalSearchSolverScope localSearchSolverScope = createLocalSearchSolverScope();
forager.solvingStarted(localSearchSolverScope);
StepScope stepScope = createStepScope(localSearchSolverScope);
@@ -91,7 +91,7 @@
public void testPickMoveFirstLastStepScoreImproving() {
// Setup
- Forager forager = new AcceptedForager(PickEarlyByScore.FIRST_LAST_STEP_SCORE_IMPROVING, Integer.MAX_VALUE);
+ Forager forager = new AcceptedForager(PickEarlyType.FIRST_LAST_STEP_SCORE_IMPROVING, Integer.MAX_VALUE);
LocalSearchSolverScope localSearchSolverScope = createLocalSearchSolverScope();
forager.solvingStarted(localSearchSolverScope);
StepScope stepScope = createStepScope(localSearchSolverScope);
@@ -121,7 +121,7 @@
// public void testPickMoveRandomly() {
// // Setup
-// Forager forager = new AcceptedForager(PickEarlyByScore.NONE, 1);
+// Forager forager = new AcceptedForager(PickEarlyType.NONE, 1);
// LocalSearchSolverScope localSearchSolverScope = createLocalSearchSolverScope();
// forager.solvingStarted(localSearchSolverScope);
// StepScope stepScope = createStepScope(localSearchSolverScope);
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -52,7 +52,7 @@
<completeSolutionTabuSize>1500</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>900</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -34,7 +34,7 @@
<!--<completePropertyTabuSize>10</completePropertyTabuSize>-->
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>900</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/curriculumcourse/solver/curriculumCourseSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -32,7 +32,7 @@
<completeSolutionTabuSize>1500</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>900</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
<!-- Great deluge experiments: -->
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -51,7 +51,7 @@
<completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1400</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
@@ -78,7 +78,7 @@
<completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1400</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
@@ -106,7 +106,7 @@
<completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1400</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
@@ -134,7 +134,7 @@
<completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1400</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -35,7 +35,7 @@
<completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1400</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/examination/solver/examinationSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -45,7 +45,7 @@
<completePropertyTabuSize>10</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1400</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
<!--<selector>-->
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/lessonschedule/solver/lessonScheduleSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/lessonschedule/solver/lessonScheduleSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/lessonschedule/solver/lessonScheduleSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -14,6 +14,6 @@
<completeUndoMoveTabuSize>10</completeUndoMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/manners2009/solver/manners2009SolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/manners2009/solver/manners2009SolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/manners2009/solver/manners2009SolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -18,6 +18,6 @@
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -27,7 +27,7 @@
<completeMoveTabuSize>5</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
</solverBenchmark>
@@ -38,7 +38,7 @@
<completeUndoMoveTabuSize>5</completeUndoMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
</solverBenchmark>
@@ -49,7 +49,7 @@
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
</solverBenchmark>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nqueens/solver/nqueensSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -18,7 +18,7 @@
<completeSolutionTabuSize>1000</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<!-- Real world problems require to use of <minimalAcceptedSelection> -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -57,7 +57,7 @@
<completePropertyTabuSize>11</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1100</minimalAcceptedSelection>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -54,7 +54,7 @@
<!--<completePropertyTabuSize>11</completePropertyTabuSize>-->
<!--</acceptor>-->
<!--<forager>-->
- <!--<foragerType>MAX_SCORE_OF_ALL</foragerType>-->
+ <!--<pickEarlyType>NEVER</pickEarlyType>-->
<!--<minimalAcceptedSelection>800</minimalAcceptedSelection>-->
<!--</forager>-->
<!--</localSearchSolver>-->
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -61,7 +61,7 @@
<completePropertyTabuSize>11</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>210</minimalAcceptedSelection>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -32,7 +32,7 @@
<completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1000</minimalAcceptedSelection>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionLongSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionLongSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionLongSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -30,7 +30,7 @@
<completePropertyTabuSize>11</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>1100</minimalAcceptedSelection>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionSprintSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionSprintSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/competition/nurseRosteringCompetitionSprintSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -24,7 +24,7 @@
<completePropertyTabuSize>11</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>210</minimalAcceptedSelection>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/nurserostering/solver/nurseRosteringSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -37,7 +37,7 @@
<completePropertyTabuSize>7</completePropertyTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>800</minimalAcceptedSelection>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -45,7 +45,7 @@
<completeUndoMoveTabuSize>3</completeUndoMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>500</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/pas/solver/patientAdmissionScheduleSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -29,7 +29,7 @@
<completeUndoMoveTabuSize>3</completeUndoMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
<minimalAcceptedSelection>500</minimalAcceptedSelection><!-- TODO tweak me -->
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -15,7 +15,7 @@
<completeSolutionTabuSize>3000</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</inheritedLocalSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/benchmark/smart/smartTravelingTournamentSolverBenchmarkConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -21,7 +21,7 @@
<completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</inheritedLocalSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/simple/simpleTravelingTournamentSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -14,7 +14,6 @@
<completeSolutionTabuSize>1500</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
-
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/resources/org/drools/planner/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -25,6 +25,6 @@
<completeMoveTabuSize>7</completeMoveTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/test/resources/org/drools/planner/examples/nqueens/solver/nqueensSmokeSolverConfig.xml 2010-06-26 16:12:05 UTC (rev 33656)
@@ -17,6 +17,6 @@
<completeSolutionTabuSize>10</completeSolutionTabuSize>
</acceptor>
<forager>
- <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ <pickEarlyType>NEVER</pickEarlyType>
</forager>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
===================================================================
--- labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2010-06-26 16:04:31 UTC (rev 33655)
+++ labs/jbossrules/trunk/drools-planner/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2010-06-26 16:12:05 UTC (rev 33656)
@@ -395,3 +395,47 @@
There's now a decent simulated annealing implementation.
In many cases it clearly beats the tabu search implementation.
See the reference manual and the nurse rostering example for more info.
+
+The ForagerType has been renamed to the PickEarlyType.
+The ForagerType MAX_SCORE_OF_ALL is now the PickEarlyType NEVER. It is also the default.
+Before in *Config.xml:
+ <forager>
+ <foragerType>MAX_SCORE_OF_ALL</foragerType>
+ ...
+ </forager>
+After in *Config.xml:
+ <forager>
+ ...
+ </forager>
+The ForagerType FIRST_BEST_SCORE_IMPROVING is the PickEarlyType FIRST_BEST_SCORE_IMPROVING.
+Before in *Config.xml:
+ <forager>
+ <foragerType>FIRST_BEST_SCORE_IMPROVING</foragerType>
+ ...
+ </forager>
+After in *Config.xml:
+ <forager>
+ <pickEarlyType>FIRST_BEST_SCORE_IMPROVING</pickEarlyType>
+ ...
+ </forager>
+The ForagerType FIRST_LAST_STEP_SCORE_IMPROVING is now the PickEarlyType FIRST_LAST_STEP_SCORE_IMPROVING.
+Before in *Config.xml:
+ <forager>
+ <foragerType>FIRST_LAST_STEP_SCORE_IMPROVING</foragerType>
+ ...
+ </forager>
+After in *Config.xml:
+ <forager>
+ <pickEarlyType>FIRST_LAST_STEP_SCORE_IMPROVING</pickEarlyType>
+ ...
+ </forager>
+The ForagerType FIRST_RANDOMLY_ACCEPTED has been removed, use the PickEarlyType NEVER with minimalAcceptedSelection 1.
+Before in *Config.xml:
+ <forager>
+ <foragerType>FIRST_RANDOMLY_ACCEPTED</foragerType>
+ </forager>
+After in *Config.xml:
+ <forager>
+ <pickEarlyType>NEVER</pickEarlyType>
+ <minimalAcceptedSelection>1</minimalAcceptedSelection>
+ </forager>
More information about the jboss-svn-commits
mailing list