fix naming

matsim-scenarios · Feb 24, 2024 · c0784b1 · c0784b1
1 parent 2daf609
commit c0784b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/main/java/org/matsim/prepare/population/ComputePlanChoices.java b/src/main/java/org/matsim/prepare/population/ComputePlanChoices.java
@@ -137,7 +137,7 @@ public Integer call() throws Exception {
 				for (String mode : modes) {
 					header.add(String.format("plan_%d_%s_usage", i, mode));
 					header.add(String.format("plan_%d_%s_km", i, mode));
-					header.add(String.format("plan_%d_%s_hour", i, mode));
+					header.add(String.format("plan_%d_%s_hours", i, mode));
 				}
 				header.add(String.format("plan_%d_available", i));
 

diff --git a/src/main/java/org/matsim/prepare/population/ComputeTripChoices.java b/src/main/java/org/matsim/prepare/population/ComputeTripChoices.java
@@ -153,9 +153,9 @@ public Integer call() throws Exception {
 			List<String> header = new ArrayList<>(List.of("p_id", "seq", "trip_n", "choice", "beelineDist"));
 
 			for (String mode : modes) {
-				header.add(mode + "_travelDist");
-				header.add(mode + "_travelTime");
-				header.add(mode + "_walkDist");
+				header.add(mode + "_km");
+				header.add(mode + "_hours");
+				header.add(mode + "_walk_km");
 				header.add(mode + "_valid");
 			}
 
@@ -186,7 +186,7 @@ private List<Object> computeAlternatives(TripRouter router, Network network, Per
 		String choice = trip.getLegsOnly().get(0).getMode();
 
 		List<Object> row = new ArrayList<>(List.of(person.getId(), person.getAttributes().getAttribute("seq"),
-			trip.getTripAttributes().getAttribute("n"), modes.indexOf(choice) + 1, beelineDist));
+			trip.getTripAttributes().getAttribute("n"), modes.indexOf(choice) + 1, beelineDist / 1000));
 
 		for (String mode : modes) {
 
@@ -217,7 +217,7 @@ private List<Object> computeAlternatives(TripRouter router, Network network, Per
 				return null;
 			}
 
-			row.addAll(List.of(travelDistance, travelTime, walkDistance, valid));
+			row.addAll(List.of(travelDistance / 1000, travelTime / 3600, walkDistance / 1000, valid));
 		}
 
 		return row;

diff --git a/src/main/java/org/matsim/prepare/population/PlanBuilder.java b/src/main/java/org/matsim/prepare/population/PlanBuilder.java
@@ -143,10 +143,6 @@ public List<Person> createPlans(Path input) {
 	 */
 	private Person createPerson(String id, int seq, List<Row> trips) {
 
-		// FIXME: for faster testing
-		if (rnd.nextDouble() > 0.1)
-			return null;
-
 		Person person = f.createPerson(Id.createPersonId(id + "_" + seq));
 
 		PersonUtils.setCarAvail(person, trips.get(0).getInt("p_age") >= 18 ? "always" : "never");

diff --git a/src/main/python/estimate_trip_choice.py b/src/main/python/estimate_trip_choice.py
@@ -12,7 +12,7 @@
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Estimate the trip choice model")
-    parser.add_argument("--input", help="Path to the input file", type=str, default="../../../choices.csv")
+    parser.add_argument("--input", help="Path to the input file", type=str, default="../../../trip-choices.csv")
     parser.add_argument("--modes", nargs="+", help="Modes to include in the model", type=str,
                         default=["walk", "pt", "car", "bike"])