Skip to content

fix(analysis): write coord of activity with facilities in ActivityWriter #4683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marecabo wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −5
Open

fix(analysis): write coord of activity with facilities in ActivityWriter #4683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions matsim/src/main/java/org/matsim/analysis/ActivityWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
import org.apache.commons.csv.CSVPrinter;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.matsim.api.core.v01.Coord;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
import org.matsim.api.core.v01.population.Activity;
import org.matsim.api.core.v01.population.Person;
import org.matsim.api.core.v01.population.Plan;
import org.matsim.core.config.Config;
import org.matsim.core.controler.Controler;
import org.matsim.core.controler.OutputDirectoryHierarchy;
import org.matsim.core.population.PopulationUtils;
import org.matsim.core.router.TripStructureUtils;
import org.matsim.core.scoring.ExperiencedPlansService;
import org.matsim.core.utils.io.IOUtils;
Expand All @@ -27,6 +30,9 @@ public class ActivityWriter {
@Inject
private Config config;

@Inject
Scenario scenario;

@Inject
private ExperiencedPlansService experiencedPlansService;

Expand All @@ -48,7 +54,7 @@ void writeCsv(int iteration) {
.setHeader(header).build());

for (Map.Entry<Id<Person>, Plan> e : experiencedPlansService.getExperiencedPlans().entrySet()) {
writeActivitiesPerPerson(e.getKey(), e.getValue(), attributes, csvPrinter);
this.writeActivitiesPerPerson(e.getKey(), e.getValue(), attributes, csvPrinter);
}

csvPrinter.close();
Expand All @@ -59,7 +65,7 @@ void writeCsv(int iteration) {
log.info("...done");
}

private static void writeActivitiesPerPerson(Id<Person> personId, Plan plan, List<String> attributes, CSVPrinter csvPrinter) throws IOException {
private void writeActivitiesPerPerson(Id<Person> personId, Plan plan, List<String> attributes, CSVPrinter csvPrinter) throws IOException {
int i = 0;
for (Activity act : TripStructureUtils.getActivities(plan, TripStructureUtils.StageActivityHandling.ExcludeStageActivities)) {

Expand All @@ -76,9 +82,10 @@ private static void writeActivitiesPerPerson(Id<Person> personId, Plan plan, Lis
line.add(act.getLinkId() != null ? act.getLinkId() : "");
line.add(act.getFacilityId() != null ? act.getFacilityId(): "");

if (act.getCoord() != null) {
line.add(act.getCoord().getX());
line.add(act.getCoord().getY());
Coord coord = PopulationUtils.decideOnCoordForActivity(act, scenario);
if (coord != null) {
line.add(coord.getX());
line.add(coord.getY());
} else {
line.add("");
line.add("");
Expand Down
Loading