fix sbb module test, add missing entries for new contrib

matsim-org · Sep 20, 2023 · 8c78ddf · 8c78ddf
1 parent 570c46b
commit 8c78ddf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/verify-push.yaml b/.github/workflows/verify-push.yaml
@@ -55,6 +55,7 @@ jobs:
           - contribs/socnetsim
           - contribs/sumo
           - contribs/pseudosimulation
+          - contribs/railsim
           - contribs/roadpricing
           - contribs/analysis
           - contribs/eventsBasedPTRouter

diff --git a/contribs/README.md b/contribs/README.md
@@ -41,6 +41,7 @@ The MATSim core development team cannot make any guarantee that these extensions
 | [parking](parking/README.md)                                             | Parking infrastructure and supply constraints
 | [protobuf](protobuf/README.md)                                           | Protocol buffer implementation and converter for the MATSim event infrastructure
 | [pseudosimulation](pseudosimulation/README.md)                           | Pseudo-simulation to speed-up simulation times
+| [railsim](railsim/README.md)                                             | A large-scale hybrid micro- and mesoscopic simulation approach for railway operation
 | [roadpricing](roadpricing/README.md)                                     | Functionality to simulate different road-pricing scenarios in MATSim
 | [shared_mobility](shared_mobility/README.md)                             | Simulate human-driven shared mobility (i.e., micromobility)
 | [signals](signals/README.md)                                             | Simulate traffic lights microscopically

diff --git a/contribs/sbb-extensions/src/test/java/ch/sbb/matsim/mobsim/qsim/pt/TestQSimModule.java b/contribs/sbb-extensions/src/test/java/ch/sbb/matsim/mobsim/qsim/pt/TestQSimModule.java
@@ -4,10 +4,13 @@
 
 package ch.sbb.matsim.mobsim.qsim.pt;
 
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
 import org.matsim.core.config.Config;
+import org.matsim.core.events.EventsUtils;
 import org.matsim.core.mobsim.qsim.AbstractQSimModule;
-import org.matsim.core.mobsim.qsim.pt.ComplexTransitStopHandlerFactory;
-import org.matsim.core.mobsim.qsim.pt.TransitStopHandlerFactory;
+import org.matsim.core.mobsim.qsim.QSim;
+import org.matsim.core.mobsim.qsim.pt.*;
 import org.matsim.core.replanning.ReplanningContext;
 
 /**
@@ -29,8 +32,15 @@ public TestQSimModule(Config config) {
     protected void configureQSim() {
         bind(ReplanningContext.class).toInstance(context);
         bind(TransitStopHandlerFactory.class).to(ComplexTransitStopHandlerFactory.class);
+		bind(TransitDriverAgentFactory.class).to(DefaultTransitDriverAgentFactory.class);
     }
 
+	@Provides
+	@Singleton
+	public TransitStopAgentTracker transitStopAgentTracker(QSim qSim) {
+		return new TransitStopAgentTracker(qSim.getEventsManager());
+	}
+
     public static final class DummyReplanningContext implements ReplanningContext {
 
         private int iteration = 0;