activity analysis

eqasim-org · Jan 26, 2025 · 8b5c351 · 8b5c351
1 parent 6aac1a6
commit 8b5c351
Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/core/src/main/java/org/eqasim/core/analysis/activities/ActivityItem.java b/core/src/main/java/org/eqasim/core/analysis/activities/ActivityItem.java
@@ -1,7 +1,9 @@
 package org.eqasim.core.analysis.activities;
 
 import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.population.Person;
+import org.matsim.facilities.ActivityFacility;
 
 public class ActivityItem {
 	public Id<Person> personId;
@@ -11,15 +13,19 @@ public class ActivityItem {
 	public double endTime;
 	public double x;
 	public double y;
+	public Id<ActivityFacility> facilityId;
+	public Id<Link> linkId;
 
 	public ActivityItem(Id<Person> personId, int activityIndex, String purpose, double startTime, double endTime,
-			double x, double y) {
+			double x, double y, Id<ActivityFacility> facilityId, Id<Link> linkId) {
 		this.personId = personId;
 		this.activityIndex = activityIndex;
 		this.purpose = purpose;
 		this.startTime = startTime;
 		this.endTime = endTime;
 		this.x = x;
 		this.y = y;
+		this.facilityId = facilityId;
+		this.linkId = linkId;
 	}
 }
diff --git a/core/src/main/java/org/eqasim/core/analysis/activities/ActivityListener.java b/core/src/main/java/org/eqasim/core/analysis/activities/ActivityListener.java
@@ -48,7 +48,8 @@ public void handleEvent(ActivityStartEvent event) {
 
 				// this is not the first one
 				ActivityItem activity = new ActivityItem(event.getPersonId(), personActivityIndex, event.getActType(),
-						event.getTime(), Double.POSITIVE_INFINITY, event.getCoord().getX(), event.getCoord().getY());
+						event.getTime(), Double.POSITIVE_INFINITY, event.getCoord().getX(), event.getCoord().getY(),
+						event.getFacilityId(), event.getLinkId());
 
 				activities.add(activity);
 				ongoing.put(event.getPersonId(), activity);
@@ -67,10 +68,11 @@ public void handleEvent(ActivityEndEvent event) {
 						// can happen for BeforeVrpSchedule activities of DRT vehicles
 						return;
 					}
-					
+
 					// this is the first one
 					activity = new ActivityItem(event.getPersonId(), 0, event.getActType(), Double.NEGATIVE_INFINITY,
-							event.getTime(), event.getCoord().getX(), event.getCoord().getY());
+							event.getTime(), event.getCoord().getX(), event.getCoord().getY(), event.getFacilityId(),
+							event.getLinkId());
 
 					Verify.verify(activityIndex.put(event.getPersonId(), 0) == null);
 

diff --git a/core/src/main/java/org/eqasim/core/analysis/activities/ActivityReaderFromPopulation.java b/core/src/main/java/org/eqasim/core/analysis/activities/ActivityReaderFromPopulation.java
@@ -104,7 +104,8 @@ public Collection<ActivityItem> readActivities(Population population) {
 							}
 
 							activityItems.add(new ActivityItem(person.getId(), personActivityIndex, activity.getType(),
-									startTime, endTime, location.getX(), location.getY()));
+									startTime, endTime, location.getX(), location.getY(), activity.getFacilityId(),
+									activity.getLinkId()));
 
 							personActivityIndex++;
 						}

diff --git a/core/src/main/java/org/eqasim/core/analysis/activities/ActivityWriter.java b/core/src/main/java/org/eqasim/core/analysis/activities/ActivityWriter.java
@@ -43,6 +43,8 @@ private String formatHeader() {
 				"end_time", //
 				"x", //
 				"y", //
+				"facility_id", //
+				"link_id", //
 		});
 	}
 
@@ -55,6 +57,8 @@ private String formatActivity(ActivityItem activity) {
 				String.valueOf(activity.endTime), //
 				String.valueOf(activity.x), //
 				String.valueOf(activity.y), //
+				activity.facilityId.toString(), //
+				activity.linkId.toString(), //
 		});
 	}
 }