[Rails-commits] 18xx/rails/ui/swing ORPanel.java,1.58,1.59

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

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

Modified Files:
	ORPanel.java 
Log Message:
Several fixes and improvements to the revenue calculator and the network iterator.

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** ORPanel.java	20 Apr 2010 19:45:40 -0000	1.58
--- ORPanel.java	27 Apr 2010 23:24:50 -0000	1.59
***************
*** 12,15 ****
--- 12,16 ----
  
  import org.jgrapht.Graph;
+ import org.jgrapht.graph.SimpleGraph;
  
  import rails.algorithms.*;
***************
*** 594,598 ****
          NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
          nwGraph.generateGraph(mapManager.getHexesAsList());
!         Graph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
          
          if (companyName.equals("All")) {
--- 595,599 ----
          NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
          nwGraph.generateGraph(mapManager.getHexesAsList());
!         SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
          
          if (companyName.equals("All")) {
***************
*** 603,607 ****
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             Graph<NetworkVertex, NetworkEdge> graph = nwGraph.getRailRoadGraph(company);
  
  //            NetworkGraphBuilder.visualize(graph, "Network of " + companyName);
--- 604,608 ----
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             SimpleGraph<NetworkVertex, NetworkEdge> graph = nwGraph.getRailRoadGraph(company);
  
  //            NetworkGraphBuilder.visualize(graph, "Network of " + companyName);
***************
*** 641,646 ****
  //                ra.refreshRevenueCalculator();
  
!                 ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"), true);
! //                ra.populateRevenueCalculator(company, gm.getCurrentPhase(), true);
                  log.info("Revenue Adapter:" + ra);
                  revenueValue = ra.calculateRevenue();
--- 642,647 ----
  //                ra.refreshRevenueCalculator();
  
! //                ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"), true);
!                 ra.populateRevenueCalculator(company, gm.getCurrentPhase(), true);
                  log.info("Revenue Adapter:" + ra);
                  revenueValue = ra.calculateRevenue();
***************
*** 813,817 ****
          NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
          nwGraph.generateGraph(mapManager.getHexesAsList());
!         Graph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
  
          mapGraph = NetworkGraphBuilder.optimizeGraph(mapGraph);
--- 814,818 ----
          NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
          nwGraph.generateGraph(mapManager.getHexesAsList());
!         SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
  
          mapGraph = NetworkGraphBuilder.optimizeGraph(mapGraph);