Merge branch 'master' into 2821-rename-freight-contrib-2

matsim-org · Oct 13, 2023 · 355d936 · 355d936
2 parents f8fe8fc + 07b699e
commit 355d936
Show file tree

Hide file tree

Showing 38 changed files with 176 additions and 4,437 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,9 +4,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    groups:
-      maven:
-        patterns: ["*"]
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/...ing/src/test/java/org/matsim/contrib/carsharing/runExample/RunCarsharingRelocationIT.java b/...ing/src/test/java/org/matsim/contrib/carsharing/runExample/RunCarsharingRelocationIT.java
diff --git a/...va/org/matsim/contrib/common/randomizedtransitrouter/RandomizingTransitRouterFactory.java b/...va/org/matsim/contrib/common/randomizedtransitrouter/RandomizingTransitRouterFactory.java
diff --git a/...ava/org/matsim/contrib/common/randomizedtransitrouter/RandomizingTransitRouterModule.java b/...ava/org/matsim/contrib/common/randomizedtransitrouter/RandomizingTransitRouterModule.java
diff --git a/...ntrib/common/randomizedtransitrouter/RandomizingTransitRouterTravelTimeAndDisutility.java b/...ntrib/common/randomizedtransitrouter/RandomizingTransitRouterTravelTimeAndDisutility.java