Merge branch 'master' into 2868-replace-txt-with-csv

matsim-org · Oct 13, 2023 · 4277709 · 4277709
2 parents 0119ae4 + a06649b
commit 4277709
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...pplication/src/main/java/org/matsim/application/prepare/network/CreateGeoJsonNetwork.java b/...pplication/src/main/java/org/matsim/application/prepare/network/CreateGeoJsonNetwork.java
@@ -45,7 +45,7 @@ public class CreateGeoJsonNetwork implements MATSimAppCommand {
 	@CommandLine.Option(names = "--match-id", description = "Pattern to filter links by id")
 	private String matchId;
 
-	@CommandLine.Option(names = "--mode-filter", split = ",", defaultValue = "car",
+	@CommandLine.Option(names = "--mode-filter", split = ",", defaultValue = "car,freight,drt",
 		description = "Only keep links if they have one of the specified modes. Specify 'none' to disable.")
 	private Set<String> modes;
 

diff --git a/contribs/simwrapper/src/main/java/org/matsim/simwrapper/SimWrapperListener.java b/contribs/simwrapper/src/main/java/org/matsim/simwrapper/SimWrapperListener.java
@@ -109,7 +109,7 @@ private List<DashboardProvider> loadProvider(ImmutableSet<ClassPath.ClassInfo> c
 		List<DashboardProvider> result = new ArrayList<>();
 		for (ClassPath.ClassInfo info : classes) {
 			Class<?> clazz = info.load();
-			if (clazz.isAssignableFrom(DashboardProvider.class)) {
+			if (DashboardProvider.class.isAssignableFrom(clazz)) {
 				try {
 					Constructor<?> c = clazz.getDeclaredConstructor();
 					DashboardProvider o = (DashboardProvider) c.newInstance();

diff --git a/contribs/simwrapper/src/main/java/org/matsim/simwrapper/SimWrapperRunner.java b/contribs/simwrapper/src/main/java/org/matsim/simwrapper/SimWrapperRunner.java
@@ -30,6 +30,10 @@ public class SimWrapperRunner implements MATSimAppCommand {
 	@CommandLine.Option(names = "--exclude", split = ",", description = "Exclusion that will be added to the config.")
 	private Set<String> exclude;
 
+	public static void main(String[] args) {
+		new SimWrapperRunner().execute(args);
+	}
+
 	@Override
 	public Integer call() throws Exception {
 		for (Path input : inputPaths) {