add indices for trip and leg to traversals (#239)

Author: sebhoerl

core/src/main/java/org/eqasim/core/tools/ExportLinkTraversals.java

@@ -5,17 +5,22 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
+import org.eqasim.core.analysis.legs.LegListenerItem;
 import org.eqasim.core.scenario.cutter.extent.ScenarioExtent;
 import org.eqasim.core.scenario.cutter.extent.ShapeScenarioExtent;
 import org.matsim.api.core.v01.Coord;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.IdMap;
+import org.matsim.api.core.v01.events.ActivityEndEvent;
 import org.matsim.api.core.v01.events.LinkEnterEvent;
 import org.matsim.api.core.v01.events.LinkLeaveEvent;
 import org.matsim.api.core.v01.events.VehicleEntersTrafficEvent;
 import org.matsim.api.core.v01.events.VehicleLeavesTrafficEvent;
+import org.matsim.api.core.v01.events.handler.ActivityEndEventHandler;
 import org.matsim.api.core.v01.events.handler.LinkEnterEventHandler;
 import org.matsim.api.core.v01.events.handler.LinkLeaveEventHandler;
 import org.matsim.api.core.v01.events.handler.VehicleEntersTrafficEventHandler;
@@ -30,6 +35,7 @@
 import org.matsim.core.events.MatsimEventsReader;
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.network.io.MatsimNetworkReader;
+import org.matsim.core.router.TripStructureUtils;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.vehicles.Vehicle;
 
@@ -65,13 +71,15 @@ static public void main(String[] args) throws ConfigurationException, MalformedU
 	}
 
 	private static class TraversalExporter implements VehicleEntersTrafficEventHandler,
-			VehicleLeavesTrafficEventHandler, LinkEnterEventHandler, LinkLeaveEventHandler {
+			VehicleLeavesTrafficEventHandler, LinkEnterEventHandler, LinkLeaveEventHandler, ActivityEndEventHandler {
 		private final BufferedWriter writer;
 		private final ScenarioExtent extent;
 		private final Network network;
 
 		private final IdMap<Vehicle, Id<Person>> drivers = new IdMap<>(Vehicle.class);
 		private final IdMap<Person, LinkEnterEvent> enterEvents = new IdMap<>(Person.class);
+		private final Map<Id<Person>, Integer> tripIndex = new HashMap<>();
+		private final Map<Id<Person>, Integer> legIndex = new HashMap<>();
 
 		TraversalExporter(BufferedWriter writer, ScenarioExtent extent, Network network) {
 			this.writer = writer;
@@ -80,7 +88,7 @@ private static class TraversalExporter implements VehicleEntersTrafficEventHandl
 
 			try {
 				writer.write(String.join(";", Arrays.asList( //
-						"person_id", "vehicle_id", "link_id", "enter_time", "leave_time")) + "\n");
+						"person_id", "vehicle_id", "link_id", "enter_time", "leave_time", "trip_index", "leg_index")) + "\n");
 			} catch (IOException e) {
 				throw new RuntimeException(e);
 			}
@@ -119,7 +127,7 @@ public void handleEvent(LinkLeaveEvent event) {
 			}
 		}
 
-		private void writeTraversal(Id<Person> personId, LinkEnterEvent enterEvent, LinkLeaveEvent leaveEvent) {
+		private void writeTraversal(Id<Person> personId,  LinkEnterEvent enterEvent, LinkLeaveEvent leaveEvent) {
 			final Id<Vehicle> vehicleId;
 			final Id<Link> linkId;
 
@@ -145,18 +153,47 @@ private void writeTraversal(Id<Person> personId, LinkEnterEvent enterEvent, Link
 					return; // ignore this one as it doesn't touch the requested extent
 				}
 			}
+			
+			int localTripIndex = tripIndex.getOrDefault(personId, 0);
+			int localLegIndex = legIndex.getOrDefault(personId, 0);
 
 			try {
 				writer.write(String.join(";", new String[] { //
 						personId.toString(), //
 						vehicleId.toString(), //
 						linkId.toString(), //
 						String.valueOf(enterTime), //
-						String.valueOf(leaveTime) //
+						String.valueOf(leaveTime), //
+						String.valueOf(localTripIndex), //
+						String.valueOf(localLegIndex) //
 				}) + "\n");
 			} catch (IOException e) {
 				throw new RuntimeException(e);
 			}
 		}
+
+		@Override
+		public void handleEvent(ActivityEndEvent event) {
+			Integer localLegIndex = legIndex.get(event.getPersonId());
+
+			if (localLegIndex == null) {
+				localLegIndex = 0;
+			} else {
+				localLegIndex = localLegIndex + 1;
+			}
+
+			Integer personTripIndex = tripIndex.get(event.getPersonId());
+
+			if (!TripStructureUtils.isStageActivityType(event.getActType())) {
+				if (personTripIndex == null) {
+					personTripIndex = 0;
+				} else {
+					personTripIndex = personTripIndex + 1;
+				}
+			}
+
+			tripIndex.put(event.getPersonId(), personTripIndex);
+			legIndex.put(event.getPersonId(), localLegIndex);
+		}
 	}
 }