chore: simplify logic

Author: zepfred

src/main/java/ai/timefold/solver/benchmarks/examples/tsp/domain/Domicile.java

@@ -13,16 +13,6 @@ public Domicile(long id) {
         super(id);
     }
 
-    @Override
-    public Standstill getPreviousStandstill() {
-        return null;
-    }
-
-    @Override
-    public long getDistanceFromPreviousStandstill() {
-        return 0;
-    }
-
     @Override
     public long getDistanceToNextStandstill() {
         var next = getNextStandstill();

src/main/java/ai/timefold/solver/benchmarks/examples/tsp/domain/Standstill.java

@@ -37,10 +37,6 @@ public long getId() {
         return id;
     }
 
-    public abstract Standstill getPreviousStandstill();
-
-    public abstract long getDistanceFromPreviousStandstill();
-
     public abstract long getDistanceToNextStandstill();
 
     @InverseRelationShadowVariable(sourceVariableName = "previousStandstill")

src/main/java/ai/timefold/solver/benchmarks/examples/tsp/domain/Visit.java

@@ -37,7 +37,6 @@ public void setLocation(Location location) {
     }
 
     @PlanningVariable(graphType = PlanningVariableGraphType.CHAINED)
-    @Override
     public Standstill getPreviousStandstill() {
         return previousStandstill;
     }
@@ -59,18 +58,6 @@ public void setDomicile(Domicile domicile) {
     // Complex methods
     // ************************************************************************
 
-    /**
-     * @return a positive number, the distance multiplied by 1000 to avoid floating point arithmetic rounding errors
-     */
-    @JsonIgnore
-    @Override
-    public long getDistanceFromPreviousStandstill() {
-        if (previousStandstill == null) {
-            return 0L;
-        }
-        return getDistanceFrom(previousStandstill);
-    }
-
     /**
      * @return a positive number, the distance multiplied by 1000 to avoid floating point arithmetic rounding errors
      */

src/main/java/ai/timefold/solver/benchmarks/examples/tsp/optional/score/TspIncrementalScoreCalculator.java

@@ -1,6 +1,5 @@
 package ai.timefold.solver.benchmarks.examples.tsp.optional.score;
 
-import ai.timefold.solver.benchmarks.examples.tsp.domain.Domicile;
 import ai.timefold.solver.benchmarks.examples.tsp.domain.Standstill;
 import ai.timefold.solver.benchmarks.examples.tsp.domain.TspSolution;
 import ai.timefold.solver.benchmarks.examples.tsp.domain.Visit;
@@ -9,14 +8,12 @@
 
 public class TspIncrementalScoreCalculator implements IncrementalScoreCalculator<TspSolution, SimpleLongScore> {
 
-    private Domicile domicile;
-
     private long score;
 
     @Override
     public void resetWorkingSolution(TspSolution tspSolution) {
-        domicile = tspSolution.getDomicile();
         score = 0L;
+        insert(tspSolution.getDomicile());
         for (Visit visit : tspSolution.getVisitList()) {
             insert(visit);
         }
@@ -53,23 +50,11 @@ public void afterEntityRemoved(Object entity) {
     }
 
     private void insert(Standstill visit) {
-        Standstill previousStandstill = visit.getPreviousStandstill();
-        if (previousStandstill != null) {
-            score -= visit.getDistanceFromPreviousStandstill();
-            // HACK: This counts too much, but the insert/retracts balance each other out
-            score += previousStandstill.getDistanceTo(domicile);
-            score -= visit.getDistanceTo(domicile);
-        }
+        score -= visit.getDistanceToNextStandstill();
     }
 
     private void retract(Standstill visit) {
-        Standstill previousStandstill = visit.getPreviousStandstill();
-        if (previousStandstill != null) {
-            score += visit.getDistanceFromPreviousStandstill();
-            // HACK: This counts too much, but the insert/retracts balance each other out
-            score -= previousStandstill.getDistanceTo(domicile);
-            score += visit.getDistanceTo(domicile);
-        }
+        score += visit.getDistanceToNextStandstill();
     }
 
     @Override