[Rails-commits] 18xx/rails/algorithms RevenueAdapter.java, 1.19, 1.20 NetworkGraphBuilder.java, 1.11, 1.12

[Stefan F. <ste...@us...>]

Update of /cvsroot/rails/18xx/rails/algorithms
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7661/rails/algorithms

Modified Files:
	RevenueAdapter.java NetworkGraphBuilder.java 
Log Message:
Some minor refactoring

Index: RevenueAdapter.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/algorithms/RevenueAdapter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** RevenueAdapter.java	21 May 2010 07:36:10 -0000	1.19
--- RevenueAdapter.java	22 May 2010 18:42:26 -0000	1.20
***************
*** 19,22 ****
--- 19,23 ----
  import rails.game.GameManagerI;
  import rails.game.MapHex;
+ import rails.game.MapManager;
  import rails.game.PhaseI;
  import rails.game.PublicCompanyI;
***************
*** 80,83 ****
--- 81,94 ----
      }
      
+     public static RevenueAdapter createRevenueAdapter(GameManagerI gm, PublicCompanyI company, PhaseI phase) {
+         MapManager mapManager = gm.getMapManager();
+         NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
+         nwGraph.generateGraph(mapManager.getHexesAsList());
+         RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company, phase);
+         ra.populateFromRails();
+         return ra;
+     }
+     
+     
      public PublicCompanyI getCompany() {
          return company;

Index: NetworkGraphBuilder.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/algorithms/NetworkGraphBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NetworkGraphBuilder.java	20 May 2010 19:57:01 -0000	1.11
--- NetworkGraphBuilder.java	22 May 2010 18:42:26 -0000	1.12
***************
*** 99,103 ****
                  } else {
                      mapGraph.addEdge(startVertex, endVertex, edge);
!                     log.info("Added edge " + edge.getConnection());
                  }
              }
--- 99,103 ----
                  } else {
                      mapGraph.addEdge(startVertex, endVertex, edge);
!                     log.info("Added non-greedy edge " + edge.getConnection());
                  }
              }
***************
*** 143,147 ****
                  mapGraph.addEdge(vertex, otherVertex, 
                          edge);
!                 log.info("Added edge " + edge.getConnection());
              }
          }
--- 143,147 ----
                  mapGraph.addEdge(vertex, otherVertex, 
                          edge);
!                 log.info("Added greedy edge " + edge.getConnection());
              }
          }
***************
*** 286,289 ****
--- 286,290 ----
                      target.isSide() && graph.edgesOf(target).size() == 2 || target.isStation()) {
                  edge.setGreedy(true);
+                 log.info("Increased greedness for " + edge.getConnection());
              }
          }
***************
*** 302,307 ****
              Set<NetworkEdge> vertexEdges = graph.edgesOf(vertex);
              
!             // remove singletons
              if (vertexEdges.size() == 0) {
                  graph.removeVertex(vertex);
                  removed = true;
--- 303,309 ----
              Set<NetworkEdge> vertexEdges = graph.edgesOf(vertex);
              
!             // remove hermit
              if (vertexEdges.size() == 0) {
+                 log.info("Remove hermit (no connection) = "  + vertex);
                  graph.removeVertex(vertex);
                  removed = true;
***************
*** 313,316 ****
--- 315,319 ----
  
              if (vertexEdges.size() == 1) { 
+                 log.info("Remove deadend side (single connection) = "  + vertex);
                  graph.removeVertex(vertex);
                  removed = true;
***************
*** 321,324 ****
--- 324,328 ----
                  if (edges[0].isGreedy() == edges[1].isGreedy()) {
                      if (!edges[0].isGreedy()) {
+                         log.info("Remove deadend side (no greedy connection) = "  + vertex);
                          // two non greedy edges indicate a deadend
                          graph.removeVertex(vertex);