Remove unused code from A*

Author: leonardehrenfried

application/src/main/java/org/opentripplanner/astar/AStar.java

@@ -194,11 +194,6 @@ private void runSearch() {
        */
       if (timeout != null && nVisited % 100 == 0 && System.currentTimeMillis() > abortTime) {
         LOG.warn("Search timeout. origin={} target={}", fromVertices, toVertices);
-        // Rather than returning null to indicate that the search was aborted/timed out, we instead
-        // set a flag in the SPT and return it anyway. This allows returning a partial list results
-        // even when a timeout occurs.
-        spt.setAborted();
-
         break;
       }
 

application/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java

@@ -1,7 +1,5 @@
 package org.opentripplanner.astar.model;
 
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Multiset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -15,8 +13,6 @@
 import org.opentripplanner.astar.spi.AStarState;
 import org.opentripplanner.astar.spi.AStarVertex;
 import org.opentripplanner.astar.spi.DominanceFunction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class keeps track which graph vertices have been visited and their associated states, so
@@ -40,15 +36,10 @@ public class ShortestPathTree<
   Vertex extends AStarVertex<State, Edge, Vertex>
 > {
 
-  private static final Logger LOG = LoggerFactory.getLogger(ShortestPathTree.class);
-
   public final DominanceFunction<State> dominanceFunction;
 
   private final Map<Vertex, List<State>> stateSets;
 
-  /** Indicates that the search timed out or was otherwise aborted. */
-  private boolean aborted = false;
-
   public ShortestPathTree(DominanceFunction<State> dominanceFunction) {
     this.dominanceFunction = dominanceFunction;
     // Initialized with a reasonable size, see #4445
@@ -80,37 +71,6 @@ public GraphPath<State, Edge, Vertex> getPath(Vertex dest) {
     }
   }
 
-  /** Print out a summary of the number of states and vertices. */
-  public void dump() {
-    Multiset<Integer> histogram = HashMultiset.create();
-    int statesCount = 0;
-    int maxSize = 0;
-    for (Map.Entry<Vertex, List<State>> kv : stateSets.entrySet()) {
-      List<State> states = kv.getValue();
-      int size = states.size();
-      histogram.add(size);
-      statesCount += size;
-      if (size > maxSize) {
-        maxSize = size;
-      }
-    }
-    LOG.info(
-      "SPT: vertices: " +
-      stateSets.size() +
-      " states: total: " +
-      statesCount +
-      " per vertex max: " +
-      maxSize +
-      " avg: " +
-      ((statesCount * 1.0) / stateSets.size())
-    );
-    List<Integer> nStates = new ArrayList<>(histogram.elementSet());
-    Collections.sort(nStates);
-    for (Integer nState : nStates) {
-      LOG.info("{} states: {} vertices.", nState, histogram.count(nState));
-    }
-  }
-
   public Set<Vertex> getVertices() {
     return stateSets.keySet();
   }
@@ -240,10 +200,6 @@ public Collection<State> getAllStates() {
     return allStates;
   }
 
-  public void setAborted() {
-    aborted = true;
-  }
-
   public String toString() {
     return "ShortestPathTree(" + this.stateSets.size() + " vertices)";
   }