Fixing generation of output csv files.

java-r5rcore/src/org/ipea/r5r/Process/AccessibilityEstimator.java

@@ -37,6 +37,11 @@ public void setDecayFunction(String decayFunction, double decayValue) {
         this.decayFunction.prepare();
     }
 
+    @Override
+    protected boolean isOneToOne() {
+        return false;
+    }
+
     public AccessibilityEstimator(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         super(threadPool, transportNetwork, routingProperties);
     }

java-r5rcore/src/org/ipea/r5r/Process/DetailedItineraryPlanner.java

@@ -18,6 +18,11 @@ public class DetailedItineraryPlanner extends R5Process {
     private boolean dropItineraryGeometry = false;
     public void dropItineraryGeometry() { dropItineraryGeometry = true; }
 
+    @Override
+    protected boolean isOneToOne() {
+        return true;
+    }
+
     public DetailedItineraryPlanner(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         super(threadPool, transportNetwork, routingProperties);
     }

java-r5rcore/src/org/ipea/r5r/Process/FastDetailedItineraryPlanner.java

@@ -25,6 +25,11 @@ private boolean hasFares() {
         return routingProperties.fareCalculator != null;
     }
 
+    @Override
+    protected boolean isOneToOne() {
+        return true;
+    }
+
     public FastDetailedItineraryPlanner(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         super(threadPool, transportNetwork, routingProperties);
     }

java-r5rcore/src/org/ipea/r5r/Process/ParetoFrontierCalculator.java

@@ -15,6 +15,11 @@
 
 public class ParetoFrontierCalculator  extends R5Process {
 
+    @Override
+    protected boolean isOneToOne() {
+        return false;
+    }
+
     public ParetoFrontierCalculator(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         super(threadPool, transportNetwork, routingProperties);
     }

java-r5rcore/src/org/ipea/r5r/Process/ParetoItineraryPlanner.java

@@ -16,6 +16,11 @@ public class ParetoItineraryPlanner extends R5Process {
 
     public static boolean travelAllowanceActive = true;
 
+    @Override
+    protected boolean isOneToOne() {
+        return true;
+    }
+
     public ParetoItineraryPlanner(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         super(threadPool, transportNetwork, routingProperties);
     }

java-r5rcore/src/org/ipea/r5r/Process/R5Process.java

@@ -59,6 +59,8 @@ public abstract class R5Process {
     protected int maxCarTime;
     protected int maxTripDuration;
 
+    protected abstract boolean isOneToOne();
+
     public R5Process(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         this.r5rThreadPool = threadPool;
         this.transportNetwork = transportNetwork;
@@ -189,7 +191,7 @@ private RDataFrame tryRunProcess(AtomicInteger totalProcessed, int index) {
             }
 
             if (Utils.saveOutputToCsv & results != null) {
-                String filename = Utils.outputCsvFolder + "/from_" + fromIds[index] + "_" + toIds[index] +  ".csv";
+                String filename = getCsvFilename(index);
                 results.saveToCsv(filename);
                 results.clear();
             }
@@ -204,6 +206,20 @@ private RDataFrame tryRunProcess(AtomicInteger totalProcessed, int index) {
         return Utils.saveOutputToCsv ? null : results;
     }
 
+    private String getCsvFilename(int index) {
+        String filename;
+        if (this.isOneToOne()) {
+            // one-to-one functions, such as detailed itineraries
+            // save one file per origin-destination pair
+            filename = Utils.outputCsvFolder + "/from_" + fromIds[index] + "_to_" + toIds[index] +  ".csv";
+        } else {
+            // one-to-many functions, such as travel time matrix
+            // save one file per origin
+            filename = Utils.outputCsvFolder + "/from_" + fromIds[index] +  ".csv";
+        }
+        return filename;
+    }
+
     protected abstract RDataFrame runProcess(int index) throws ParseException;
 
     private RDataFrame mergeResults(List<RDataFrame> processResults) {

java-r5rcore/src/org/ipea/r5r/Process/TravelTimeMatrixComputer.java

@@ -87,6 +87,11 @@ public void unreachable() {
 
     private static final Logger LOG = LoggerFactory.getLogger(TravelTimeMatrixComputer.class);
 
+    @Override
+    protected boolean isOneToOne() {
+        return false;
+    }
+
     public TravelTimeMatrixComputer(ForkJoinPool threadPool, TransportNetwork transportNetwork, RoutingProperties routingProperties) {
         super(threadPool, transportNetwork, routingProperties);
     }