[jboss-svn-commits] JBL Code SVN: r28207 - in labs/jbossrules/trunk/drools-solver: drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jul 19 04:20:24 EDT 2009
Author: ge0ffrey
Date: 2009-07-19 04:20:23 -0400 (Sun, 19 Jul 2009)
New Revision: 28207
Added:
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/ScoreAttainedTermination.java
Removed:
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/FeasableScoreTermination.java
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java
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/examination/solver/examinationSolverConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009SolverConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nqueensSolverConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/test/resources/org/drools/solver/examples/nqueens/solver/nqueensSmokeSolverConfig.xml
labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
Log:
JBRULES-1373 Rename FeasibleScoreTermination to ScoreAttainedTermination
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/config/localsearch/termination/TerminationConfig.java 2009-07-19 08:20:23 UTC (rev 28207)
@@ -6,7 +6,7 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import org.drools.solver.core.localsearch.termination.AbstractCompositeTermination;
import org.drools.solver.core.localsearch.termination.AndCompositeTermination;
-import org.drools.solver.core.localsearch.termination.FeasableScoreTermination;
+import org.drools.solver.core.localsearch.termination.ScoreAttainedTermination;
import org.drools.solver.core.localsearch.termination.Termination;
import org.drools.solver.core.localsearch.termination.OrCompositeTermination;
import org.drools.solver.core.localsearch.termination.StepCountTermination;
@@ -30,7 +30,7 @@
private Long maximumSecondsSpend = null;
private Long maximumMinutesSpend = null;
private Long maximumHouresSpend = null;
- private String feasableScore = null;
+ private String scoreAttained = null;
private Integer maximumUnimprovedStepCount = null;
public Termination getTermination() {
@@ -97,12 +97,12 @@
this.maximumHouresSpend = maximumHouresSpend;
}
- public String getFeasableScore() {
- return feasableScore;
+ public String getScoreAttained() {
+ return scoreAttained;
}
- public void setFeasableScore(String feasableScore) {
- this.feasableScore = feasableScore;
+ public void setScoreAttained(String scoreAttained) {
+ this.scoreAttained = scoreAttained;
}
public Integer getMaximumUnimprovedStepCount() {
@@ -158,9 +158,9 @@
termination.setMaximumTimeMillisSpend(maximumHouresSpend * 3600000L);
terminationList.add(termination);
}
- if (feasableScore != null) {
- FeasableScoreTermination termination = new FeasableScoreTermination();
- termination.setFeasableScore(scoreDefinition.parseScore(feasableScore));
+ if (scoreAttained != null) {
+ ScoreAttainedTermination termination = new ScoreAttainedTermination();
+ termination.setScoreAttained(scoreDefinition.parseScore(scoreAttained));
terminationList.add(termination);
}
if (maximumUnimprovedStepCount != null) {
@@ -215,8 +215,8 @@
if (maximumHouresSpend == null) {
maximumHouresSpend = inheritedConfig.getMaximumHouresSpend();
}
- if (feasableScore == null) {
- feasableScore = inheritedConfig.getFeasableScore();
+ if (scoreAttained == null) {
+ scoreAttained = inheritedConfig.getScoreAttained();
}
if (maximumUnimprovedStepCount == null) {
maximumUnimprovedStepCount = inheritedConfig.getMaximumUnimprovedStepCount();
Deleted: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/FeasableScoreTermination.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/FeasableScoreTermination.java 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/FeasableScoreTermination.java 2009-07-19 08:20:23 UTC (rev 28207)
@@ -1,35 +0,0 @@
-package org.drools.solver.core.localsearch.termination;
-
-import org.drools.solver.core.localsearch.LocalSearchSolverScope;
-import org.drools.solver.core.localsearch.StepScope;
-import org.drools.solver.core.score.Score;
-
-/**
- * @author Geoffrey De Smet
- */
-public class FeasableScoreTermination extends AbstractTermination {
-
- private Score feasableScore;
-
- public void setFeasableScore(Score feasableScore) {
- this.feasableScore = feasableScore;
- }
-
- // ************************************************************************
- // Worker methods
- // ************************************************************************
-
- public boolean isTerminated(StepScope stepScope) {
- Score bestScore = stepScope.getLocalSearchSolverScope().getBestScore();
- return bestScore.compareTo(feasableScore) >= 0;
- }
-
- public double calculateTimeGradient(StepScope stepScope) {
- LocalSearchSolverScope localSearchSolverScope = stepScope.getLocalSearchSolverScope();
- Score startingScore = localSearchSolverScope.getStartingScore();
- Score stepScore = localSearchSolverScope.getLastCompletedStepScope().getScore();
- return localSearchSolverScope.getScoreDefinition()
- .calculateTimeGradient(startingScore, feasableScore, stepScore);
- }
-
-}
Copied: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/ScoreAttainedTermination.java (from rev 28180, labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/FeasableScoreTermination.java)
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/ScoreAttainedTermination.java (rev 0)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/termination/ScoreAttainedTermination.java 2009-07-19 08:20:23 UTC (rev 28207)
@@ -0,0 +1,35 @@
+package org.drools.solver.core.localsearch.termination;
+
+import org.drools.solver.core.localsearch.LocalSearchSolverScope;
+import org.drools.solver.core.localsearch.StepScope;
+import org.drools.solver.core.score.Score;
+
+/**
+ * @author Geoffrey De Smet
+ */
+public class ScoreAttainedTermination extends AbstractTermination {
+
+ private Score scoreAttained;
+
+ public void setScoreAttained(Score scoreAttained) {
+ this.scoreAttained = scoreAttained;
+ }
+
+ // ************************************************************************
+ // Worker methods
+ // ************************************************************************
+
+ public boolean isTerminated(StepScope stepScope) {
+ Score bestScore = stepScope.getLocalSearchSolverScope().getBestScore();
+ return bestScore.compareTo(scoreAttained) >= 0;
+ }
+
+ public double calculateTimeGradient(StepScope stepScope) {
+ LocalSearchSolverScope localSearchSolverScope = stepScope.getLocalSearchSolverScope();
+ Score startingScore = localSearchSolverScope.getStartingScore();
+ Score stepScore = localSearchSolverScope.getLastCompletedStepScope().getScore();
+ return localSearchSolverScope.getScoreDefinition()
+ .calculateTimeGradient(startingScore, scoreAttained, stepScore);
+ }
+
+}
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 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/curriculumcourse/solver/curriculumCourseSolverConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -12,7 +12,7 @@
ge0ffrey's old pc: 1152
-->
<maximumSecondsSpend>429</maximumSecondsSpend>
- <!--<feasableScore>-0hard/-999999soft</feasableScore>-->
+ <!--<scoreAttained>-0hard/-999999soft</scoreAttained>-->
<!--<maximumStepCount>100</maximumStepCount>-->
</termination>
<selector>
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 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/itc2007/examination/solver/examinationSolverConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -12,7 +12,7 @@
ge0ffrey's old pc: 1152
-->
<maximumSecondsSpend>429</maximumSecondsSpend>
- <!--<feasableScore>-0hard/-999999soft</feasableScore>-->
+ <!--<scoreAttained>-0hard/-999999soft</scoreAttained>-->
<!--<maximumStepCount>100</maximumStepCount>-->
</termination>
<!--<deciderScoreComparatorFactory>-->
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009SolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009SolverConfig.xml 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/manners2009/solver/manners2009SolverConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -8,7 +8,7 @@
<termination>
<!--<terminationCompositionStyle>OR</terminationCompositionStyle>-->
<!--<maximumMinutesSpend>1</maximumMinutesSpend>-->
- <feasableScore>0</feasableScore>
+ <scoreAttained>0</scoreAttained>
</termination>
<selector>
<moveFactoryClass>org.drools.solver.examples.manners2009.solver.move.factory.SeatDesignationSwitchMoveFactory</moveFactoryClass>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -12,7 +12,7 @@
<termination>
<terminationCompositionStyle>OR</terminationCompositionStyle>
<maximumSecondsSpend>10</maximumSecondsSpend>
- <feasableScore>0</feasableScore>
+ <scoreAttained>0</scoreAttained>
</termination>
<selector>
<moveFactoryClass>org.drools.solver.examples.nqueens.solver.move.factory.NQueensMoveFactory</moveFactoryClass>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nqueensSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nqueensSolverConfig.xml 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/nqueens/solver/nqueensSolverConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -7,7 +7,7 @@
<termination>
<terminationCompositionStyle>OR</terminationCompositionStyle>
<maximumStepCount>100</maximumStepCount>
- <feasableScore>0</feasableScore>
+ <scoreAttained>0</scoreAttained>
</termination>
<selector>
<moveFactoryClass>org.drools.solver.examples.nqueens.solver.move.factory.NQueensMoveFactory</moveFactoryClass>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/benchmark/smart/breakNl14SolverBenchmarkConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -25,7 +25,7 @@
<localSearchSolver>
<termination>
<terminationCompositionStyle>AND</terminationCompositionStyle>
- <feasableScore>-0hard/-188727soft</feasableScore><!-- 188728 (Van Hentenryck and Vergados, May 18 2006) -->
+ <scoreAttained>-0hard/-188727soft</scoreAttained><!-- 188728 (Van Hentenryck and Vergados, May 18 2006) -->
<maximumUnimprovedStepCount>20</maximumUnimprovedStepCount>
</termination>
</localSearchSolver>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/resources/org/drools/solver/examples/travelingtournament/solver/smart/smartTravelingTournamentSolverConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -5,7 +5,7 @@
<scoreDefinitionType>HARD_AND_SOFT</scoreDefinitionType>
</scoreDefinition>
<termination>
- <feasableScore>0hard/0soft</feasableScore>
+ <scoreAttained>0hard/0soft</scoreAttained>
</termination>
<deciderScoreComparatorFactory>
<deciderScoreComparatorFactoryType>SHIFTING_HARD_PENALTY</deciderScoreComparatorFactoryType>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/test/resources/org/drools/solver/examples/nqueens/solver/nqueensSmokeSolverConfig.xml
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/test/resources/org/drools/solver/examples/nqueens/solver/nqueensSmokeSolverConfig.xml 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/test/resources/org/drools/solver/examples/nqueens/solver/nqueensSmokeSolverConfig.xml 2009-07-19 08:20:23 UTC (rev 28207)
@@ -7,7 +7,7 @@
<termination>
<terminationCompositionStyle>OR</terminationCompositionStyle>
<maximumStepCount>5</maximumStepCount>
- <feasableScore>0</feasableScore>
+ <scoreAttained>0</scoreAttained>
</termination>
<selector>
<moveFactoryClass>org.drools.solver.examples.nqueens.solver.move.factory.NQueensMoveFactory</moveFactoryClass>
Modified: labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt
===================================================================
--- labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2009-07-19 08:09:51 UTC (rev 28206)
+++ labs/jbossrules/trunk/drools-solver/src/main/assembly/docs/UpgradeFromPreviousVersionRecipe.txt 2009-07-19 08:20:23 UTC (rev 28207)
@@ -79,7 +79,7 @@
From 5.0.1 to 5.1.0
-------------------
-The Solver.cancel() method has been renamed to Solver.terminateEarly()
+The method Solver.cancel() has been renamed to Solver.terminateEarly()
because it does not undo the solving but terminates it early and there's a best solution.
Before:
solver.cancel();
@@ -93,7 +93,7 @@
solver.isTerminatedEarly();
-The Finish interface has been renamed to Termination
+The interface Finish has been renamed to Termination
because Termination seems the defacto standard name for it in the literature.
Before:
... extends Finish
@@ -119,3 +119,15 @@
.isFinished(...)
After:
.isTerminated(...)
+
+
+The class FeasableScoreTermination has been renamed to ScoreAttainedTermination.
+Its property feasableScore has been renamed to scoreAttained.
+Before in solver config xml's and benchmarker config xml's :
+ <termination>
+ <feasableScore>...</feasableScore>
+ </termination>
+After:
+ <termination>
+ <scoreAttained>...</scoreAttained>
+ </termination>
More information about the jboss-svn-commits
mailing list