Introduce BestSolutionRecaller.updateBestSolution(solverScope);

kiegroup · Nov 17, 2016 · 1c65fd8 · 1c65fd8
1 parent 44f8995
commit 1c65fd8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/...va/org/optaplanner/core/impl/constructionheuristic/DefaultConstructionHeuristicPhase.java b/...va/org/optaplanner/core/impl/constructionheuristic/DefaultConstructionHeuristicPhase.java
@@ -132,8 +132,7 @@ public void stepEnded(ConstructionHeuristicStepScope<Solution_> stepScope) {
 
     public void phaseEnded(ConstructionHeuristicPhaseScope<Solution_> phaseScope) {
         super.phaseEnded(phaseScope);
-        Solution_ newBestSolution = phaseScope.getScoreDirector().cloneWorkingSolution();
+        bestSolutionRecaller.updateBestSolution(phaseScope.getSolverScope());
-        bestSolutionRecaller.updateBestSolution(phaseScope.getSolverScope(), newBestSolution);
         entityPlacer.phaseEnded(phaseScope);
         decider.phaseEnded(phaseScope);
         phaseScope.endingNow();

diff --git a/...rg/optaplanner/core/impl/constructionheuristic/scope/ConstructionHeuristicPhaseScope.java b/...rg/optaplanner/core/impl/constructionheuristic/scope/ConstructionHeuristicPhaseScope.java
@@ -29,7 +29,7 @@ public class ConstructionHeuristicPhaseScope<Solution_> extends AbstractPhaseSco
 
     public ConstructionHeuristicPhaseScope(DefaultSolverScope<Solution_> solverScope) {
         super(solverScope);
-        lastCompletedStepScope = new ConstructionHeuristicStepScope(this, -1);
+        lastCompletedStepScope = new ConstructionHeuristicStepScope<>(this, -1);
     }
 
     @Override

diff --git a/...planner-core/src/main/java/org/optaplanner/core/impl/phase/custom/DefaultCustomPhase.java b/...planner-core/src/main/java/org/optaplanner/core/impl/phase/custom/DefaultCustomPhase.java
@@ -101,9 +101,7 @@ public void stepEnded(CustomStepScope<Solution_> stepScope) {
         super.stepEnded(stepScope);
         boolean bestScoreImproved = stepScope.getBestScoreImproved();
         if (forceUpdateBestSolution && !bestScoreImproved) {
-            DefaultSolverScope<Solution_> solverScope = stepScope.getPhaseScope().getSolverScope();
+            bestSolutionRecaller.updateBestSolution(stepScope.getPhaseScope().getSolverScope());
-            Solution_ newBestSolution = solverScope.getScoreDirector().cloneWorkingSolution();
-            bestSolutionRecaller.updateBestSolution(solverScope, newBestSolution);
         }
         CustomPhaseScope<Solution_> phaseScope = stepScope.getPhaseScope();
         if (logger.isDebugEnabled()) {

diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/impl/solver/DefaultSolver.java b/optaplanner-core/src/main/java/org/optaplanner/core/impl/solver/DefaultSolver.java
@@ -232,8 +232,7 @@ private boolean checkProblemFactChanges() {
                 problemFactChange = problemFactChangeQueue.poll();
             }
             basicPlumbingTermination.endProblemFactChangesProcessing();
-            Solution_ newBestSolution = solverScope.getScoreDirector().cloneWorkingSolution();
+            bestSolutionRecaller.updateBestSolution(solverScope);
-            bestSolutionRecaller.updateBestSolution(solverScope, newBestSolution);
             logger.info("Real-time problem fact changes done: step total ({}), new best score ({}).",
                     stepIndex, score);
             return true;

diff --git a/...er-core/src/main/java/org/optaplanner/core/impl/solver/recaller/BestSolutionRecaller.java b/...er-core/src/main/java/org/optaplanner/core/impl/solver/recaller/BestSolutionRecaller.java
@@ -121,17 +121,22 @@ public void processWorkingSolutionDuringMove(Score score, AbstractStepScope<Solu
         }
     }
 
-    public void updateBestSolution(DefaultSolverScope<Solution_> solverScope, Solution_ solution) {
+    public void updateBestSolution(DefaultSolverScope<Solution_> solverScope) {
-        Score score = solverScope.getSolutionDescriptor().getScore(solution);
+        Solution_ newBestSolution = solverScope.getScoreDirector().cloneWorkingSolution();
+        updateBestSolution(solverScope, newBestSolution);
+    }
+
+    public void updateBestSolution(DefaultSolverScope<Solution_> solverScope, Solution_ newBestSolution) {
+        Score score = solverScope.getSolutionDescriptor().getScore(newBestSolution);
         if (score.isSolutionInitialized()) {
             if (!solverScope.isBestSolutionInitialized()) {
                 solverScope.setStartingInitializedScore(score);
             }
         }
-        solverScope.setBestSolution(solution);
+        solverScope.setBestSolution(newBestSolution);
         solverScope.setBestScore(score);
         solverScope.setBestSolutionTimeMillis(System.currentTimeMillis());
-        solverEventSupport.fireBestSolutionChanged(solverScope, solution);
+        solverEventSupport.fireBestSolutionChanged(solverScope, newBestSolution);
     }
 
 }