Merge pull request #238 from erik-vos/master

Dual trains and a partial fix for runTo=tokenonly.

src/main/java/net/sf/rails/algorithms/NetworkAdapter.java

@@ -40,8 +40,15 @@ public NetworkGraph getMapGraph() {
         return mapGraph;
     }
 
-    public NetworkGraph getRouteGraph(PublicCompany company, boolean addHQ) {
-        routeGraph = NetworkGraph.createRouteGraph(getMapGraph(), company, addHQ);
+    /**
+     *
+     * @param company
+     * @param addHQ
+     * @param running true for train runs, false for tile or token lay allowances
+     * @return
+     */
+    public NetworkGraph getRouteGraph(PublicCompany company, boolean addHQ, boolean running) {
+        routeGraph = NetworkGraph.createRouteGraph(getMapGraph(), company, addHQ, running);
         this.company = company;
         this.addHQ = addHQ;
         log.info("RouteGraph created");
@@ -51,9 +58,9 @@ public NetworkGraph getRouteGraph(PublicCompany company, boolean addHQ) {
     public NetworkGraph getRouteGraphCached(PublicCompany company, boolean addHQ) {
         if (routeGraph == null || company != this.company || addHQ != this.addHQ) {
             if (mapGraph != null) {
-                routeGraph = NetworkGraph.createRouteGraph(mapGraph, company, addHQ);
+                routeGraph = NetworkGraph.createRouteGraph(mapGraph, company, addHQ, true);
             } else {
-                getRouteGraph(company, addHQ);
+                getRouteGraph(company, addHQ, true);
             }
         }
         return routeGraph;

src/main/java/net/sf/rails/algorithms/NetworkGraph.java

@@ -51,9 +51,17 @@ public static NetworkGraph createMapGraph(RailsRoot root) {
         return graph;
     }
 
-    public static NetworkGraph createRouteGraph(NetworkGraph mapGraph, PublicCompany company, boolean addHQ) {
+    /**
+     *
+     * @param mapGraph
+     * @param company
+     * @param addHQ
+     * @param running true for train runs, false for tile or token lay allowances
+     * @return
+     */
+    public static NetworkGraph createRouteGraph(NetworkGraph mapGraph, PublicCompany company, boolean addHQ, boolean running) {
         NetworkGraph newGraph = new NetworkGraph();
-        newGraph.initRouteGraph(mapGraph, company, addHQ);
+        newGraph.initRouteGraph(mapGraph, company, addHQ, running);
         newGraph.rebuildVertices();
         return newGraph;
     }
@@ -342,7 +350,14 @@ private boolean removeVertexes(Collection<NetworkVertex> protectedVertices) {
         return removed;
     }
 
-    private void initRouteGraph(NetworkGraph mapGraph, PublicCompany company, boolean addHQ) {
+    /**
+     *
+     * @param mapGraph
+     * @param company
+     * @param addHQ
+     * @param running true for train runs, false for tile or token lay allowances
+     */
+    private void initRouteGraph(NetworkGraph mapGraph, PublicCompany company, boolean addHQ, boolean running) {
 
         // add graph modifiers
         RevenueManager revenueManager = company.getRoot().getRevenueManager();
@@ -351,7 +366,7 @@ private void initRouteGraph(NetworkGraph mapGraph, PublicCompany company, boolea
         }
 
         // set sinks on mapgraph
-        NetworkVertex.initAllRailsVertices(mapGraph, company, null);
+        NetworkVertex.initAllRailsVertices(mapGraph, company, null, running);
 
         // add Company HQ
         NetworkVertex hqVertex = new NetworkVertex(company);

src/main/java/net/sf/rails/algorithms/NetworkVertex.java

@@ -226,9 +226,10 @@ public boolean isOfType(VertexType vertexType, StationType stationType) {
 
     /**
      * Initialize for rails vertexes
+     * @param running true for train runs, false for tile or token lay allowances
      * @return true = can stay inside the network, false = has to be removed
      */
-    public boolean initRailsVertex(PublicCompany company) {
+    public boolean initRailsVertex(PublicCompany company, boolean running) {
         // side vertices use the defaults, virtuals cannot use this function
         if (virtual || type == VertexType.SIDE) return true;
 
@@ -239,7 +240,7 @@ public boolean initRailsVertex(PublicCompany company) {
 
         // check if it has to be removed because it is run-to only
         // if company == null, then no vertex gets removed
-        if (company != null && !stop.isRunToAllowedFor(company)) {
+        if (company != null && !stop.isRunToAllowedFor(company, running)) {
            log.info("Vertex is removed");
            return false;
         }
@@ -319,15 +320,16 @@ public int compare(NetworkVertex vA, NetworkVertex vB) {
      * @param graph network graph
      * @param company the company (with regard to values, sinks and removals)
      * @param phase the current phase (with regard to values)
+     * @param running true for train runs, false for tile or token lay allowances
      */
     public static void initAllRailsVertices(NetworkGraph graph,
-            PublicCompany company,  Phase phase) {
+            PublicCompany company,  Phase phase, boolean running) {
 
         // store vertices for removal
         List<NetworkVertex> verticesToRemove = new ArrayList<NetworkVertex>();
         for (NetworkVertex v:graph.getGraph().vertexSet()) {
             if (company != null) {
-                if (!v.initRailsVertex(company)) {
+                if (!v.initRailsVertex(company, running)) {
                     verticesToRemove.add(v);
                 }
             }

src/main/java/net/sf/rails/algorithms/RevenueAdapter.java

@@ -205,7 +205,7 @@ public void populateFromRails() {
         graph = networkAdapter.getRouteGraphCached(company, false);
 
         // initialize vertices
-        NetworkVertex.initAllRailsVertices(graph, company, phase);
+        NetworkVertex.initAllRailsVertices(graph, company, phase, true);
 
         // define startVertexes
         addStartVertices(graph.getCompanyBaseTokenVertexes(company));

src/main/java/net/sf/rails/algorithms/RevenueBonusTemplate.java

@@ -118,7 +118,7 @@ private boolean convertVertices(RevenueBonus bonus, NetworkGraph graph, MapHex h
 
     private void convertTrainTypes(RevenueBonus bonus, TrainManager tm) {
         for (String identTrainType:identTrainTypes) {
-            TrainType trainType = tm.getTypeByName(identTrainType);
+            TrainType trainType = tm.getTrainTypeByName(identTrainType);
             if (trainType != null) {
                 bonus.addTrainType(trainType);
             }

src/main/java/net/sf/rails/game/GameDef.java

@@ -24,7 +24,8 @@ public enum Parm {
         REMOVE_TRAIN_BEFORE_SR(false),
         EMERGENCY_MUST_BUY_CHEAPEST_TRAIN (true),
         EMERGENCY_MAY_ALWAYS_BUY_NEW_TRAIN (false),
-        EMERGENCY_MAY_BUY_FROM_COMPANY (true);
+        EMERGENCY_MAY_BUY_FROM_COMPANY (true),
+        DUAL_TRAIN_BECOMES_UNDECIDED_IN_POOL (false);
 
         private Object defaultValue;
 

src/main/java/net/sf/rails/game/MapHex.java

@@ -791,7 +791,7 @@ public PrivateCompany getBlockingPrivateCompany() {
     }
 
     /**
-     * @param private company that blocks the hex (use argument null to unblock)
+     * @param company private company that blocks the hex (use argument null to unblock)
      */
     public void setBlockingPrivateCompany(PrivateCompany company) {
         blockingPrivateCompany.set(company);

src/main/java/net/sf/rails/game/MapManager.java

@@ -57,13 +57,13 @@ public MapManager(RailsRoot parent, String id) {
         super(parent, id);
     }
 
-    /**
+    /*
      * @see net.sf.rails.common.parser.Configurable#configureFromXML(org.w3c.dom.Element)
      */
     public void configureFromXML(Tag tag) throws ConfigurationException {
 
         mapOrientation = MapOrientation.create(tag);
-        
+
         List<Tag> hexTags = tag.getChildren("Hex");
         ImmutableMap.Builder<MapHex.Coordinates, MapHex> hexBuilder = ImmutableMap.builder();
         ImmutableSortedSet.Builder<Integer> tileCostsBuilder= ImmutableSortedSet.naturalOrder();
@@ -262,7 +262,7 @@ private void calculateHexDistances (MapHex initHex, MapHex currentHex, int depth
      * Calculate the distances between a given tokenable city hex
      * and all other tokenable city hexes.
      * <p> Distances are cached.
-     * @param hex Start hex
+     * @param initHex Start hex
      * @return Sorted integer list containing all occurring distances only once.
      */
     public SortedSet<Integer> getCityDistances (MapHex initHex) {