[Rails-commits] 18xx/rails/ui/swing ORPanel.java,1.56,1.57

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

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

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

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** ORPanel.java	16 Apr 2010 16:38:21 -0000	1.56
--- ORPanel.java	19 Apr 2010 19:35:38 -0000	1.57
***************
*** 607,621 ****
              NetworkGraphBuilder.visualize(graph, "Optimized Network of " + companyName);
  
!             // revenue calculation example
!             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, does not work so far, thus use map graph
!             // RevenueAdapter ra = new RevenueAdapter(graph);
  
              // get trains
--- 607,621 ----
              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
***************
*** 627,639 ****
              while (anotherTrain) {
                  // create results
! //                ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"));
!                 ra.populateRevenueCalculator(company, gm.getCurrentPhase());
!                 ra.activateRevenuePrediction();
                  log.info("Revenue Adapter:" + ra);
                  int revenueValue = ra.calculateRevenue();
                  log.info("Revenue Value:" + revenueValue);
!                 log.info("Revenue run:" + ra.getOptimalRun());
!                 JOptionPane.showMessageDialog(orWindow, "RevenueValue = " + revenueValue +
!                         "\n RevenueRun = " + ra.getOptimalRun());
  
                  String trainsToAdd =
--- 627,648 ----
              while (anotherTrain) {
                  // create results
! //                ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"), false);
!                 ra.populateRevenueCalculator(company, gm.getCurrentPhase(), false);
                  log.info("Revenue Adapter:" + ra);
                  int revenueValue = ra.calculateRevenue();
                  log.info("Revenue Value:" + revenueValue);
!                 log.info("Revenue run:" + ra.getOptimalRunPrettyPrint());
!                 JOptionPane.showMessageDialog(orWindow, "Without Prediction: RevenueValue = " + revenueValue +
!                         "\n RevenueRun = " + ra.getOptimalRunPrettyPrint());
! 
!                 ra.refreshRevenueCalculator();
! //                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());
!                 JOptionPane.showMessageDialog(orWindow, "With Prediction: RevenueValue = " + revenueValue +
!                         "\n RevenueRun = " + ra.getOptimalRunPrettyPrint());
  
                  String trainsToAdd =
***************
*** 822,827 ****
          }
  
!         ra.populateRevenueCalculator(company, gm.getCurrentPhase());
!         ra.activateRevenuePrediction();
          ra.addRevenueListener(this);
  
--- 831,835 ----
          }
  
!         ra.populateRevenueCalculator(company, gm.getCurrentPhase(), true);
          ra.addRevenueListener(this);