[Rails-commits] 18xx/rails/ui/swing ORUIManager.java, 1.72, 1.73 ORPanel.java, 1.62, 1.63

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

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

Modified Files:
	ORUIManager.java ORPanel.java 
Log Message:
Updated and refactored revenue calculation, added support for 1835

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** ORUIManager.java	13 May 2010 09:51:32 -0000	1.72
--- ORUIManager.java	14 May 2010 15:19:57 -0000	1.73
***************
*** 129,133 ****
          nwGraph.generateGraph(mapManager.getHexesAsList());
          SimpleGraph<NetworkVertex, NetworkEdge> graph =
!             nwGraph.getRailRoadGraph(orComp);
          return graph;
      }
--- 129,133 ----
          nwGraph.generateGraph(mapManager.getHexesAsList());
          SimpleGraph<NetworkVertex, NetworkEdge> graph =
!             nwGraph.getRailRoadGraph(orComp, true);
          return graph;
      }
***************
*** 1103,1115 ****
                                  JOptionPane.QUESTION_MESSAGE, null, options,
                                  options[0]);
!                 if (exchangedTrainName != null) {
!                     int index = oldTrainOptions.indexOf(exchangedTrainName);
!                     if (index >= 0) {
!                         exchangedTrain = oldTrains.get(index);
!                     }
!                 }
!                 if (exchangedTrain == null) {
!                     // No valid train selected - cancel the buy action
!                     train = null;
                  }
              }
--- 1103,1109 ----
                                  JOptionPane.QUESTION_MESSAGE, null, options,
                                  options[0]);
!                 int index = oldTrainOptions.indexOf(exchangedTrainName);
!                 if (index >= 0) {
!                     exchangedTrain = oldTrains.get(index);
                  }
              }

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** ORPanel.java	11 May 2010 21:47:21 -0000	1.62
--- ORPanel.java	14 May 2010 15:19:58 -0000	1.63
***************
*** 601,628 ****
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company);
! 
!             // get trains
!             company.getPortfolio().getTrainList();
!             for (TrainI train:company.getPortfolio().getTrainList())
!                 ra.addTrain(train);
              
              boolean anotherTrain = true;
              while (anotherTrain) {
                  int revenueValue;
!                 // create results
! //                ra.populateRevenueCalculator(company, gm.getPhaseManager().getPhaseByName("8"), false);
! //                ra.populateRevenueCalculator(company, gm.getCurrentPhase(), false);
! //                log.info("Revenue Adapter:" + ra);
! //                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(gm.getCurrentPhase(), true);
                  log.info("Revenue Adapter:" + ra);
                  revenueValue = ra.calculateRevenue();
--- 601,611 ----
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
!             RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company, gm.getCurrentPhase());
!             ra.populateFromRails();
              
              boolean anotherTrain = true;
              while (anotherTrain) {
                  int revenueValue;
!                 ra.initRevenueCalculator();
                  log.info("Revenue Adapter:" + ra);
                  revenueValue = ra.calculateRevenue();
***************
*** 642,646 ****
                  } else {
                      ra.addTrainByString(trainsToAdd);
-                     ra.refreshRevenueCalculator();
                  }
              }
--- 625,628 ----
***************
*** 804,833 ****
          NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
          nwGraph.generateGraph(mapManager.getHexesAsList());
!         // run on mapgraph
! //        SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
! //
! //        mapGraph = NetworkGraphBuilder.optimizeGraph(mapGraph);
! //
! //        // 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(gm, nwGraph, company);
! 
!         // get trains
!         company.getPortfolio().getTrainList();
!         for (TrainI train:company.getPortfolio().getTrainList()) {
!             ra.addTrain(train);
!         }
! 
!         ra.populateRevenueCalculator(gm.getCurrentPhase(), true);
          ra.addRevenueListener(this);
  
--- 786,792 ----
          NetworkGraphBuilder nwGraph = new NetworkGraphBuilder();
          nwGraph.generateGraph(mapManager.getHexesAsList());
!         RevenueAdapter ra = new RevenueAdapter(gm, nwGraph, company, gm.getCurrentPhase());
!         ra.populateFromRails();
!         ra.initRevenueCalculator();
          ra.addRevenueListener(this);