tba: update to the calculator

chairemobilite · Feb 19, 2017 · 16e2759 · 16e2759
1 parent ab7c544
commit 16e2759
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/trip_based_algorithm/src/trip_based_algorithm_calculator.cpp b/trip_based_algorithm/src/trip_based_algorithm_calculator.cpp
@@ -35,7 +35,6 @@ namespace TrRouting
       tgtStopIs = std::vector<int>(1,stopsIndexById[params.endingStopId]);
     }
 
-
     // calculate for each stop index in the target stop indexes vector:
     for(const auto & tgtStopI : tgtStopIs)
     {
@@ -49,7 +48,6 @@ namespace TrRouting
       int stopToTargetI; // q
       int travelTimeToTarget;
 
-
       // fetch footpaths to target stop:
       for (auto it = footpathsByTarget.begin() + footpathsIndex[tgtStopI][0]; it != footpathsByTarget.begin() + footpathsIndex[tgtStopI][1] + 1; ++it) // (line 5)
       {
@@ -72,26 +70,22 @@ namespace TrRouting
       int  stopSeq;
       int  arrivalTimeAtNextStop;
 
-
       // fetch footpaths from source stop:
       for (auto it = footpathsBySource.begin() + footpathsIndex[srcStopI][0]; it != footpathsBySource.begin() + footpathsIndex[srcStopI][1] + 1; ++it) // (line 9)
       {
         footpathFromSource  = *it;
         stopFromSourceI     = footpathFromSource.srcI;
         readyTimeFromSource = footpathFromSource.tt + params.minWaitingTimeMinutes * 60; // (line 10)
 
-
         for (const auto & routePathIndexAndStopSeq : routePathsIndexByStop[stopFromSourceI]) // (line 11)
         {
           routePathIndex    = routePathIndexAndStopSeq[0];
           stopSeq           = routePathIndexAndStopSeq[1];
 
-
           if (tripsIndex[params.weekdayIndex][routePathIndex][0] != -1)
           {
             foundEarliestTrip = false;
 
-
             for (auto it = trips[params.weekdayIndex].begin() + tripsIndex[params.weekdayIndex][routePathIndex][0]; it != trips[params.weekdayIndex].begin() + tripsIndex[params.weekdayIndex][routePathIndex][1] + 1; ++it)
             {
               trip = *it;
@@ -136,7 +130,6 @@ namespace TrRouting
           Trip transferTrip;
           Transfer transfer;
 
-
           for(auto & reachableRoutePath : reachableRoutePaths) // (line 18)
           {
             if(reachableRoutePath.rpI == routeIndex && firstStopSeq < reachableRoutePath.stopSeq)
@@ -150,7 +143,6 @@ namespace TrRouting
             }
           }
 
-
           nextStopSeqArrivalTimeIndex = arrivalTimesIndex[params.weekdayIndex][tripI][0] + firstStopSeq + 1;
           if (nextStopSeqArrivalTimeIndex <= arrivalTimesIndex[params.weekdayIndex][tripI][1])
           {
@@ -184,6 +176,7 @@ namespace TrRouting
         }
       }
 
+      // add target stop results to json:
       int minArrivalTimeSecondForStop = infinite;
       for(int n = 0; n <= nMax; n++)
       {