[Rails-commits] 18xx/rails/algorithms RevenueCalculator.java, 1.16, 1.17 RevenueTrainRun.java, 1.7, 1.8

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

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

Modified Files:
	RevenueCalculator.java RevenueTrainRun.java 
Log Message:
Minor fixes to the revenue calculator

Index: RevenueCalculator.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/algorithms/RevenueCalculator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RevenueCalculator.java	20 May 2010 23:13:21 -0000	1.16
--- RevenueCalculator.java	25 May 2010 20:33:58 -0000	1.17
***************
*** 291,295 ****
          maxMinorRevenues = new int[nbTrains][nbVertexes];
          maxBonusRevenues = new int[nbTrains][nbVertexes + nbBonuses];
-         int cumulatedRevenues = 0;
          for (int t=startTrain; t <= finalTrain; t++) {
              int[] majorValues = new int[nbVertexes];
--- 291,294 ----
***************
*** 318,324 ****
              maxMinorRevenues[t] = bestRevenues(minorValues, trainMaxMinors[t]);
              maxBonusRevenues[t] = bestRevenues(bonusValues, trainMaxBonuses[t]);
!             cumulatedRevenues += maxMajorRevenues[t][trainMaxMajors[t]] + maxMinorRevenues[t][trainMaxMinors[t]] 
                       + maxBonusRevenues[t][trainMaxBonuses[t]];
!             maxCumulatedTrainRevenues[t] = cumulatedRevenues;
          }
          log.info("maxMajorRevenues = " + Arrays.deepToString(maxMajorRevenues));
--- 317,324 ----
              maxMinorRevenues[t] = bestRevenues(minorValues, trainMaxMinors[t]);
              maxBonusRevenues[t] = bestRevenues(bonusValues, trainMaxBonuses[t]);
!             // initially the cumulated train revenues are the individual run revenues
!             int trainRevenues = maxMajorRevenues[t][trainMaxMajors[t]] + maxMinorRevenues[t][trainMaxMinors[t]] 
                       + maxBonusRevenues[t][trainMaxBonuses[t]];
!             maxCumulatedTrainRevenues[t] = trainRevenues;
          }
          log.info("maxMajorRevenues = " + Arrays.deepToString(maxMajorRevenues));

Index: RevenueTrainRun.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/algorithms/RevenueTrainRun.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RevenueTrainRun.java	24 May 2010 20:37:17 -0000	1.7
--- RevenueTrainRun.java	25 May 2010 20:33:58 -0000	1.8
***************
*** 113,117 ****
          int majors = NetworkVertex.numberOfVertexType(uniqueVertices, VertexType.STATION, StationType.MAJOR);
          int minors = NetworkVertex.numberOfVertexType(uniqueVertices, VertexType.STATION, StationType.MINOR);
!         if (train.ignoresMinors()) {
              runPrettyPrint.append(LocalText.getText("RevenueStationsIgnoreMinors", majors));
          } else {
--- 113,117 ----
          int majors = NetworkVertex.numberOfVertexType(uniqueVertices, VertexType.STATION, StationType.MAJOR);
          int minors = NetworkVertex.numberOfVertexType(uniqueVertices, VertexType.STATION, StationType.MINOR);
!         if (train.ignoresMinors() || minors == 0) {
              runPrettyPrint.append(LocalText.getText("RevenueStationsIgnoreMinors", majors));
          } else {