[jboss-svn-commits] JBL Code SVN: r20465 - in labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core: localsearch/bestsolution and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 13 07:43:39 EDT 2008
Author: ge0ffrey
Date: 2008-06-13 07:43:39 -0400 (Fri, 13 Jun 2008)
New Revision: 20465
Modified:
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AcceptedForager.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractSelector.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/CompositeSelector.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/MoveFactorySelector.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/TopListSelector.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/AbstractMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/CachedMoveFactory.java
labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/solution/initializer/AbstractStartingSolutionInitializer.java
Log:
remove @Overrides where needed so it compiles on jdk 1.5 (and not just in jdk1.6 with source 1.5)
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/DefaultLocalSearchSolver.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -136,7 +136,6 @@
return stepScope;
}
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
localSearchSolverScope.resetTimeMillisSpend();
logger.info("Solving with random seed ({}).", randomSeed);
@@ -155,28 +154,24 @@
decider.solvingStarted(localSearchSolverScope);
}
- @Override
public void beforeDeciding(StepScope stepScope) {
bestSolutionRecaller.beforeDeciding(stepScope);
finish.beforeDeciding(stepScope);
decider.beforeDeciding(stepScope);
}
- @Override
public void stepDecided(StepScope stepScope) {
bestSolutionRecaller.stepDecided(stepScope);
finish.stepDecided(stepScope);
decider.stepDecided(stepScope);
}
- @Override
public void stepTaken(StepScope stepScope) {
bestSolutionRecaller.stepTaken(stepScope);
finish.stepTaken(stepScope);
decider.stepTaken(stepScope);
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
bestSolutionRecaller.solvingEnded(localSearchSolverScope);
finish.solvingEnded(localSearchSolverScope);
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/bestsolution/BestSolutionRecaller.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -25,7 +25,6 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
double initialScore = localSearchSolverScope.getStartingScore();
logger.info("Initialization time spend ({}) for score ({}). Updating best solution and best score.",
@@ -35,15 +34,12 @@
localSearchSolverScope.setBestScore(initialScore);
}
- @Override
public void beforeDeciding(StepScope stepScope) {
}
- @Override
public void stepDecided(StepScope stepScope) {
}
- @Override
public void stepTaken(StepScope stepScope) {
LocalSearchSolverScope localSearchSolverScope = stepScope.getLocalSearchSolverScope();
double newScore = stepScope.getScore();
@@ -59,7 +55,6 @@
}
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/DefaultDecider.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -57,14 +57,12 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
selector.solvingStarted(localSearchSolverScope);
accepter.solvingStarted(localSearchSolverScope);
forager.solvingStarted(localSearchSolverScope);
}
- @Override
public void beforeDeciding(StepScope stepScope) {
selector.beforeDeciding(stepScope);
accepter.beforeDeciding(stepScope);
@@ -122,21 +120,18 @@
forager.addMove(moveScope);
}
- @Override
public void stepDecided(StepScope stepScope) {
selector.stepDecided(stepScope);
accepter.stepDecided(stepScope);
forager.stepDecided(stepScope);
}
- @Override
public void stepTaken(StepScope stepScope) {
selector.stepTaken(stepScope);
accepter.stepTaken(stepScope);
forager.stepTaken(stepScope);
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
selector.solvingEnded(localSearchSolverScope);
accepter.solvingEnded(localSearchSolverScope);
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/AbstractAccepter.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -16,27 +16,22 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void beforeDeciding(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepDecided(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepTaken(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/CompositeAccepter.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -38,7 +38,6 @@
}
}
- @Override
public double calculateAcceptChance(MoveScope moveScope) {
double acceptChance = 1.0;
for (Accepter accepter : accepterList) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/greatdeluge/GreatDelugeAccepter.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -49,7 +49,6 @@
}
}
- @Override
public double calculateAcceptChance(MoveScope moveScope) {
if (moveScope.getScore() >= waterLevelScore) {
return 1.0;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/simulatedannealing/SimulatedAnnealingAccepter.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -24,7 +24,6 @@
// Worker methods
// ************************************************************************
- @Override
public double calculateAcceptChance(MoveScope moveScope) {
double compareScore = compareToBestScore
? moveScope.getStepScope().getLocalSearchSolverScope().getBestScore()
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/accepter/tabu/AbstractTabuAccepter.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -61,7 +61,6 @@
tabuSequenceList = new LinkedList<Object>();
}
- @Override
public double calculateAcceptChance(MoveScope moveScope) {
Collection<? extends Object> tabus = findTabu(moveScope);
int maximumTabuStepIndex = -1;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AbstractForager.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -16,27 +16,22 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void beforeDeciding(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepDecided(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepTaken(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AcceptedForager.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AcceptedForager.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/forager/AcceptedForager.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -54,7 +54,6 @@
earlyPickedMoveScope = null;
}
- @Override
public void addMove(MoveScope moveScope) {
if (moveScope.getAcceptChance() > 0.0) {
checkPickEarly(moveScope);
@@ -103,12 +102,10 @@
}
}
- @Override
public boolean isQuitEarly() {
return earlyPickedMoveScope != null;
}
- @Override
public MoveScope pickMove(StepScope stepScope) {
if (earlyPickedMoveScope != null) {
return earlyPickedMoveScope;
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractSelector.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/AbstractSelector.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -23,27 +23,22 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void beforeDeciding(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepDecided(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepTaken(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/CompositeSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/CompositeSelector.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/CompositeSelector.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -45,7 +45,6 @@
}
}
- @Override
public List<Move> selectMoveList(StepScope stepScope) {
int totalSize = 0;
List<List<Move>> subMoveLists = new ArrayList<List<Move>>(selectorList.size());
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/MoveFactorySelector.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/MoveFactorySelector.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/MoveFactorySelector.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -50,7 +50,6 @@
moveFactory.beforeDeciding(stepScope);
}
- @Override
public final List<Move> selectMoveList(StepScope stepScope) {
List<Move> moveList = moveFactory.createMoveList(stepScope.getWorkingSolution());
if (shuffle) {
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/TopListSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/TopListSelector.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/decider/selector/TopListSelector.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -30,7 +30,6 @@
topList = Collections.emptyList();
}
- @Override
public final List<Move> selectMoveList(StepScope stepScope) {
return topList;
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/localsearch/finish/AbstractFinish.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -23,27 +23,22 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void beforeDeciding(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepDecided(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepTaken(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/AbstractMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/AbstractMoveFactory.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/AbstractMoveFactory.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -23,27 +23,22 @@
// Worker methods
// ************************************************************************
- @Override
public void solvingStarted(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void beforeDeciding(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepDecided(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void stepTaken(StepScope stepScope) {
// Hook which can be optionally overwritten by subclasses.
}
- @Override
public void solvingEnded(LocalSearchSolverScope localSearchSolverScope) {
// Hook which can be optionally overwritten by subclasses.
}
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/CachedMoveFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/CachedMoveFactory.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/move/factory/CachedMoveFactory.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -21,7 +21,6 @@
public abstract List<Move> createCachedMoveList(Solution solution);
- @Override
public List<Move> createMoveList(Solution solution) {
// Shallow copy so it can be shuffled and filtered etc
return new ArrayList<Move>(cachedMoveList);
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/solution/initializer/AbstractStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/solution/initializer/AbstractStartingSolutionInitializer.java 2008-06-13 11:31:55 UTC (rev 20464)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/src/main/java/org/drools/solver/core/solution/initializer/AbstractStartingSolutionInitializer.java 2008-06-13 11:43:39 UTC (rev 20465)
@@ -15,7 +15,6 @@
// Worker methods
// ************************************************************************
- @Override
public boolean isSolutionInitialized(LocalSearchSolverScope localSearchSolverScope) {
return false;
}
More information about the jboss-svn-commits
mailing list