[Rails-commits] 18xx/rails/game/specific/_18EU OffBoardRevenueModifier.java, 1.4, 1.5 PullmanRevenueModifier.java, 1.2, 1.3

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

Update of /cvsroot/rails/18xx/rails/game/specific/_18EU
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30941/rails/game/specific/_18EU

Modified Files:
	OffBoardRevenueModifier.java PullmanRevenueModifier.java 
Log Message:
Some minor improvements to pretty print

Index: PullmanRevenueModifier.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/PullmanRevenueModifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PullmanRevenueModifier.java	21 May 2010 16:15:24 -0000	1.2
--- PullmanRevenueModifier.java	24 May 2010 20:37:17 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
  import rails.algorithms.RevenueDynamicModifier;
  import rails.algorithms.RevenueTrainRun;
+ import rails.util.LocalText;
  
  public class PullmanRevenueModifier implements RevenueDynamicModifier {
***************
*** 39,43 ****
          int maximum = 0;
          for (RevenueTrainRun trainRun:trainRuns) {
!             maximum = Math.max(maximum, maximumMajorValue(trainRun.getVertices()));
              if (maximum == maxValue) break; 
          }
--- 40,44 ----
          int maximum = 0;
          for (RevenueTrainRun trainRun:trainRuns) {
!             maximum = Math.max(maximum, maximumMajorValue(trainRun.getRunVertices()));
              if (maximum == maxValue) break; 
          }
***************
*** 50,54 ****
  
      public String prettyPrint(RevenueAdapter revenueAdapter) {
!         return "Pullman: " + pullmanValue(revenueAdapter.getOptimalRun());
      }
  
--- 51,55 ----
  
      public String prettyPrint(RevenueAdapter revenueAdapter) {
!         return LocalText.getText("Pullman") + ": " + pullmanValue(revenueAdapter.getOptimalRun());
      }
  

Index: OffBoardRevenueModifier.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OffBoardRevenueModifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** OffBoardRevenueModifier.java	24 May 2010 07:49:26 -0000	1.4
--- OffBoardRevenueModifier.java	24 May 2010 20:37:17 -0000	1.5
***************
*** 74,78 ****
              for (NetworkVertex offB:destOffBoard) {
                  for (NetworkVertex base:bases) {
!                     RevenueBonus bonus = new RevenueBonus(bonusValue, "OFFBOARD");
                      bonus.addVertex(offA); bonus.addVertex(offB); bonus.addVertex(base);
                      revenueAdapter.addRevenueBonus(bonus);
--- 74,78 ----
              for (NetworkVertex offB:destOffBoard) {
                  for (NetworkVertex base:bases) {
!                     RevenueBonus bonus = new RevenueBonus(bonusValue, "Red-To-Red");
                      bonus.addVertex(offA); bonus.addVertex(offB); bonus.addVertex(base);
                      revenueAdapter.addRevenueBonus(bonus);