[Rails-commits] 18xx/rails/ui/swing ORUIManager.java, 1.78, 1.79 ORPanel.java, 1.70, 1.71

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

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

Modified Files:
	ORUIManager.java ORPanel.java 
Log Message:
First commit of the multigraph revenue calculation, still the old algorithm active

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** ORUIManager.java	30 May 2010 10:42:39 -0000	1.78
--- ORUIManager.java	17 Jun 2010 22:10:53 -0000	1.79
***************
*** 128,134 ****
  
      private SimpleGraph<NetworkVertex, NetworkEdge> getCompanyGraph(){
!         NetworkGraphBuilder nwGraph = NetworkGraphBuilder.createMapGraph(gameUIManager.getGameManager());
!         SimpleGraph<NetworkVertex, NetworkEdge> graph =
!             nwGraph.getRailRoadGraph(orComp, true);
          return graph;
      }
--- 128,134 ----
  
      private SimpleGraph<NetworkVertex, NetworkEdge> getCompanyGraph(){
!         NetworkGraphBuilder nwGraph = NetworkGraphBuilder.create(gameUIManager.getGameManager());
!         NetworkCompanyGraph companyGraph = NetworkCompanyGraph.create(nwGraph, orComp);
!         SimpleGraph<NetworkVertex, NetworkEdge> graph = companyGraph.createRouteGraph(true);
          return graph;
      }

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** ORPanel.java	30 May 2010 10:42:39 -0000	1.70
--- ORPanel.java	17 Jun 2010 22:10:53 -0000	1.71
***************
*** 11,14 ****
--- 11,15 ----
  import org.apache.log4j.Logger;
  
+ import org.jgrapht.graph.Multigraph;
  import org.jgrapht.graph.SimpleGraph;
  
***************
*** 600,604 ****
          
          if (companyName.equals("Network")) {
!             NetworkGraphBuilder nwGraph = NetworkGraphBuilder.createMapGraph(gm);
              SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
              
--- 601,605 ----
          
          if (companyName.equals("Network")) {
!             NetworkGraphBuilder nwGraph = NetworkGraphBuilder.create(gm);
              SimpleGraph<NetworkVertex, NetworkEdge> mapGraph = nwGraph.getMapGraph();
              
***************
*** 609,621 ****
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
              List<String> addTrainList = new ArrayList<String>();
              boolean anotherTrain = true;
              RevenueAdapter ra = null;
              while (anotherTrain) {
                  ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
                  for (String addTrain:addTrainList) {
                      ra.addTrainByString(addTrain);
                  }
!                 ra.initRevenueCalculator();
                  log.info("Revenue Adapter:" + ra);
                  int revenueValue = ra.calculateRevenue();
--- 610,632 ----
              CompanyManagerI cm = gm.getCompanyManager();
              PublicCompanyI company = cm.getPublicCompany(companyName);
+ //
+ //            NetworkGraphBuilder nwGraph = NetworkGraphBuilder.create(gm);
+ //            NetworkCompanyGraph companyGraph = NetworkCompanyGraph.create(nwGraph, company);
+ //            companyGraph.createRouteGraph(false);
+ //            companyGraph.createRevenueGraph(new ArrayList<NetworkVertex>());
+ //            Multigraph<NetworkVertex, NetworkEdge> graph= companyGraph.createPhaseTwoGraph();
+ //            NetworkGraphBuilder.visualize(graph, "Phase Two Company Network");
+ //            JOptionPane.showMessageDialog(orWindow, 
+ //                    "Vertices = " + graph.vertexSet().size() + ", Edges = " + graph.edgeSet().size());
              List<String> addTrainList = new ArrayList<String>();
              boolean anotherTrain = true;
              RevenueAdapter ra = null;
              while (anotherTrain) {
+                 // multi
                  ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
                  for (String addTrain:addTrainList) {
                      ra.addTrainByString(addTrain);
                  }
!                 ra.initRevenueCalculator(true);
                  log.info("Revenue Adapter:" + ra);
                  int revenueValue = ra.calculateRevenue();
***************
*** 626,629 ****
--- 637,655 ----
                  JOptionPane.showMessageDialog(orWindow, "RevenueValue = " + revenueValue +
                          "\nRevenueRun = \n" + ra.getOptimalRunPrettyPrint());
+                 
+                 // simple
+                 ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
+                 for (String addTrain:addTrainList) {
+                     ra.addTrainByString(addTrain);
+                 }
+                 ra.initRevenueCalculator(false);
+                 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 trainString =
***************
*** 795,799 ****
          GameManagerI gm = orUIManager.getGameUIManager().getGameManager();
          RevenueAdapter ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
!         ra.initRevenueCalculator();
          ra.addRevenueListener(this);
          return ra;
--- 821,825 ----
          GameManagerI gm = orUIManager.getGameUIManager().getGameManager();
          RevenueAdapter ra = RevenueAdapter.createRevenueAdapter(gm, company, gm.getCurrentPhase());
!         ra.initRevenueCalculator(false);
          ra.addRevenueListener(this);
          return ra;