Merge branch 'master' into drtEstim

.github/workflows/verify-push.yaml

@@ -66,6 +66,7 @@ jobs:
           - contribs/simwrapper
           - contribs/sbb-extensions
           - contribs/simulatedannealing
+          - contribs/small-scale-traffic-generation
           - benchmark
 
     steps:

contribs/README.md

@@ -46,6 +46,7 @@ The MATSim core development team cannot make any guarantee that these extensions
 | [shared_mobility](shared_mobility/README.md)                             | Simulate human-driven shared mobility (i.e., micromobility)
 | [signals](signals/README.md)                                             | Simulate traffic lights microscopically
 | [simwrapper](simwrapper/README.md)                                       | Creates dashboards automatically with [SimWrapper](https://simwrapper.github.io/)
+| [small-scale-traffic-generation](small-scale-traffic-generation/README.md)       | Tool to generate small-scale commercial traffic
 | [socnetsim](socnetsim/README.md)                                         | Social network simulation
 | [sumo](sumo/README.md)                                                   | Converter and integrations for [SUMO](https://sumo.dlr.de/])
 | [taxi](taxi/README.md)                                                   | Taxi service functionality

contribs/application/src/main/java/org/matsim/application/analysis/traffic/traveltime/SampleValidationRoutes.java

@@ -23,6 +23,7 @@
 import org.matsim.application.options.InputOptions;
 import org.matsim.application.options.OutputOptions;
 import org.matsim.application.options.ShpOptions;
+import org.matsim.application.prepare.network.SampleNetwork;
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.router.costcalculators.OnlyTimeDependentTravelDisutility;
 import org.matsim.core.router.speedy.SpeedyALTFactory;
@@ -85,23 +86,6 @@ public class SampleValidationRoutes implements MATSimAppCommand {
 	@CommandLine.Option(names = "--mode", description = "Mode to validate", defaultValue = TransportMode.car)
 	private String mode;
 
-	/**
-	 * Random coord in the same direction as a link.
-	 */
-	static Coord rndCoord(SplittableRandom rnd, double dist, Link link) {
-
-		Coord v = link.getFromNode().getCoord();
-		Coord u = link.getToNode().getCoord();
-
-		var angle = Math.atan2(u.getY() - v.getY(), u.getX() - v.getX());
-
-		var sample = angle + rnd.nextDouble(-0.2, 0.2) * Math.PI * 2;
-
-		var x = Math.cos(sample) * dist;
-		var y = Math.sin(sample) * dist;
-
-		return CoordUtils.round(new Coord(v.getX() + x, v.getY() + y));
-	}
 
 	public static void main(String[] args) {
 		new SampleValidationRoutes().execute(args);
@@ -268,7 +252,7 @@ public boolean test(Link link) {
 				continue;
 			}
 
-			Coord dest = rndCoord(rnd, rnd.nextDouble(distRange.get(0), distRange.get(1)), link);
+			Coord dest = SampleNetwork.rndCoord(rnd, rnd.nextDouble(distRange.get(0), distRange.get(1)), link);
 			Link to = NetworkUtils.getNearestLink(network, dest);
 
 			if (!to.getAllowedModes().contains(mode) || exclude.test(to)) {

contribs/application/src/main/java/org/matsim/application/options/CountsOptions.java

@@ -0,0 +1,155 @@
+package org.matsim.application.options;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.network.Link;
+import org.matsim.core.utils.io.IOUtils;
+import picocli.CommandLine;
+
+import javax.annotation.Nullable;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.*;
+
+/**
+ * Common options when working with counts data.
+ */
+public final class CountsOptions {
+
+	private static final Logger log = LogManager.getLogger(CountsOptions.class);
+
+	@CommandLine.Option(names = "--counts-mapping", description = "Path to csv with count station ids to ignore")
+	private String input;
+
+	private Map<String, Id<Link>> manualMatchedCounts = null;
+	private Set<String> ignoredCounts = null;
+
+	public CountsOptions() {
+	}
+
+	public CountsOptions(@Nullable String input) {
+		this.input = input;
+	}
+
+	/**
+	 * Get list of ignored count ids.
+	 */
+	public Set<String> getIgnored() {
+		readMapping();
+		return ignoredCounts;
+	}
+
+	/**
+	 * Return mapping of count id to specified link id.
+	 */
+	public Map<String, Id<Link>> getManualMatched() {
+		readMapping();
+		return manualMatchedCounts;
+	}
+
+	private synchronized void readMapping() {
+
+		// Already read
+		if (manualMatchedCounts != null)
+			return;
+
+		manualMatchedCounts = new HashMap<>();
+		ignoredCounts = new HashSet<>();
+
+		// No input file
+		if (input == null)
+			return;
+
+		try (var reader = IOUtils.getBufferedReader(input)) {
+			CSVFormat format = CSVFormat.Builder.create()
+				.setAllowMissingColumnNames(true)
+				.setDelimiter(CsvOptions.detectDelimiter(input))
+				.setHeader()
+				.setSkipHeaderRecord(true)
+				.build();
+
+			try (CSVParser csv = new CSVParser(reader, format)) {
+				Schema schema = parseSchema(csv.getHeaderNames());
+
+				log.info("Using schema for counts mapping: {}", schema);
+
+				for (CSVRecord row : csv) {
+
+					String stationId = row.get(schema.stationColumn);
+					manualMatchedCounts.put(stationId, Id.createLinkId(row.get(schema.linkColumn)));
+
+					if (schema.usingColumn != null) {
+
+						String value = row.get(schema.usingColumn).strip().toLowerCase();
+						boolean val = value.equals("y") || value.equals("x") || value.equals("true");
+
+						if (schema.isWhiteList && !val)
+							ignoredCounts.add(stationId);
+						else if (!schema.isWhiteList && val)
+							ignoredCounts.add(stationId);
+					}
+				}
+			}
+		} catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+
+	}
+
+	/**
+	 * Check whether station id should be ignored.
+	 */
+	public boolean isIgnored(String stationId) {
+		readMapping();
+		return ignoredCounts.contains(stationId);
+	}
+
+	/**
+	 * Return manually matched link id.
+	 *
+	 * @return null if not matched
+	 */
+	public Id<Link> isManuallyMatched(String stationId) {
+		readMapping();
+
+		if (manualMatchedCounts.isEmpty() || !manualMatchedCounts.containsKey(stationId))
+			return null;
+
+		return manualMatchedCounts.get(stationId);
+	}
+
+	private Schema parseSchema(List<String> header) {
+
+		List<String> names = header.stream()
+			.map(String::toLowerCase)
+			.map(String::strip)
+			.map(s -> s.replace("_", ""))
+			.toList();
+
+		int linkId = names.indexOf("linkid");
+
+		if (linkId < 0)
+			throw new IllegalArgumentException("Link id column not found in csv: " + header);
+
+		int using = names.indexOf("using");
+		int ignore = names.indexOf("ignore");
+
+		// first or second column for station id
+		int station = linkId == 0 ? 1 : 0;
+
+		if (using > 0)
+			return new Schema(header.get(station), header.get(linkId), header.get(using), true);
+
+		if (ignore > 0)
+			return new Schema(header.get(station), header.get(linkId), header.get(ignore), false);
+
+		return new Schema(header.get(station), header.get(linkId), null, false);
+	}
+
+	private record Schema(String stationColumn, String linkColumn, String usingColumn, boolean isWhiteList) {
+	}
+}

contribs/application/src/main/java/org/matsim/application/options/CsvOptions.java

@@ -80,7 +80,7 @@ public static Character detectDelimiter(String path) throws IOException {
 	 * Get the CSV format defined by the options.
 	 */
 	public CSVFormat getFormat() {
-		CSVFormat.Builder format = this.csvFormat.getFormat().builder().setSkipHeaderRecord(true);
+		CSVFormat.Builder format = this.csvFormat.getFormat().builder().setHeader().setSkipHeaderRecord(true);
 		if (csvDelimiter != null)
 			format = format.setDelimiter(csvDelimiter);
 

contribs/application/src/main/java/org/matsim/application/options/InputOptions.java

@@ -113,6 +113,10 @@ public Network getNetwork() {
 		return NetworkUtils.readNetwork(networkPath);
 	}
 
+	public String getNetworkPath() {
+		return networkPath;
+	}
+
 	public Population getPopulation() {
 		if (!spec.requirePopulation())
 			throw new IllegalArgumentException("Population can not be accessed unless, requirePopulation=true.");

contribs/application/src/main/java/org/matsim/application/options/LanduseOptions.java

@@ -8,6 +8,7 @@
 import javax.annotation.Nullable;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -49,7 +50,7 @@ public synchronized ShpOptions.Index getIndex(String queryCRS) {
 
 		ShpOptions landShp = new ShpOptions(landuse, null, StandardCharsets.UTF_8);
 
-		index = landShp.createIndex(queryCRS, attr, filter);
+		index = landShp.createIndex(queryCRS, attr, ft-> filter == null || filter.contains(Objects.toString(ft.getAttribute(attr))));
 
 		log.info("Read {} features for landuse", index.size());