[Rails-commits] 18xx/rails/ui/swing ORPanel.java,1.61,1.62

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

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

Modified Files:
	ORPanel.java 
Log Message:
Added VertexVisitedSets and RevenueBonuses, several other improvements to the RC

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** ORPanel.java	1 May 2010 16:07:05 -0000	1.61
--- ORPanel.java	11 May 2010 21:47:21 -0000	1.62
***************
*** 4,8 ****
  import java.awt.*;
  import java.awt.event.*;
- import java.awt.geom.GeneralPath;
  import java.util.List;
  
--- 4,7 ----
***************
*** 11,15 ****
  import org.apache.log4j.Logger;
  
- import org.jgrapht.Graph;
  import org.jgrapht.graph.SimpleGraph;
  
--- 10,13 ----
***************
*** 19,23 ****
  import rails.game.action.*;
  import rails.ui.swing.elements.*;
- import rails.ui.swing.hexmap.HexMap;
  import rails.util.LocalText;
  import rails.util.Util;
--- 17,20 ----
***************
*** 604,624 ****
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             SimpleGraph<NetworkVertex, NetworkEdge> graph = nwGraph.getRailRoadGraph(company);
! 
! //            NetworkGraphBuilder.visualize(graph, "Network of " + companyName);
!             graph = NetworkGraphBuilder.optimizeGraph(graph);
! //            NetworkGraphBuilder.visualize(graph, "Optimized Network of " + companyName);
! 
!             // revenue calculation example on mapGraph
! //            mapGraph = NetworkGraphBuilder.optimizeGraph(mapGraph);
! //            RevenueAdapter ra = new RevenueAdapter(mapGraph);
! //            // set tokens
! //            List<TokenI> tokens = company.getTokens();
! //            for (TokenI token:tokens){
! //                NetworkVertex vertex = nwGraph.getVertex(token);
! //                if (vertex != null) ra.addStartVertex(vertex);
! //            }
! //             run on railroad graph
!              RevenueAdapter ra = new RevenueAdapter(graph);
  
              // get trains
--- 601,605 ----
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company);
  
              // get trains
***************
*** 643,655 ****
  
  //                ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"), true);
!                 ra.populateRevenueCalculator(company, gm.getCurrentPhase(), true);
                  log.info("Revenue Adapter:" + ra);
                  revenueValue = ra.calculateRevenue();
                  log.info("Revenue Value:" + revenueValue);
!                 log.info("Revenue run:" + ra.getOptimalRunPrettyPrint());
                  ra.drawOptimalRunAsPath(orUIManager.getMap());
                  orUIManager.getMap().repaint();
!                 JOptionPane.showMessageDialog(orWindow, "With Prediction: RevenueValue = " + revenueValue +
!                         "\n RevenueRun = " + ra.getOptimalRunPrettyPrint());
  
                  String trainsToAdd =
--- 624,636 ----
  
  //                ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"), true);
!                 ra.populateRevenueCalculator(gm.getCurrentPhase(), true);
                  log.info("Revenue Adapter:" + ra);
                  revenueValue = ra.calculateRevenue();
                  log.info("Revenue Value:" + revenueValue);
!                 log.info("Revenue Run:" + ra.getOptimalRunPrettyPrint());
                  ra.drawOptimalRunAsPath(orUIManager.getMap());
                  orUIManager.getMap().repaint();
!                 JOptionPane.showMessageDialog(orWindow, "RevenueValue = " + revenueValue +
!                         "\nRevenueRun = \n" + ra.getOptimalRunPrettyPrint());
  
                  String trainsToAdd =
***************
*** 840,846 ****
      
          // run on railroad graph, does not work so far, thus use map graph
!         SimpleGraph<NetworkVertex, NetworkEdge> graph = nwGraph.getRailRoadGraph(company);
!         graph = NetworkGraphBuilder.optimizeGraph(graph);
!         RevenueAdapter ra = new RevenueAdapter(graph);
  
          // get trains
--- 821,825 ----
      
          // run on railroad graph, does not work so far, thus use map graph
!         RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company);
  
          // get trains
***************
*** 850,854 ****
          }
  
!         ra.populateRevenueCalculator(company, gm.getCurrentPhase(), true);
          ra.addRevenueListener(this);
  
--- 829,833 ----
          }
  
!         ra.populateRevenueCalculator(gm.getCurrentPhase(), true);
          ra.addRevenueListener(this);