reorganizign

gunnarfloetteroed · Aug 27, 2020 · 2ede73c · 2ede73c
1 parent f78c0ce
commit 2ede73c
Show file tree

Hide file tree

Showing 16 changed files with 3,234 additions and 964 deletions.
diff --git a/experimental/src/main/java/stockholm/chengxi/bicyclematsim/transcadnetworkimport/Test.java b/experimental/src/main/java/stockholm/chengxi/bicyclematsim/transcadnetworkimport/Test.java
diff --git a/...tal/src/main/java/stockholm/chengxi/bicyclematsim/transcadnetworkimport/package-info.java b/...tal/src/main/java/stockholm/chengxi/bicyclematsim/transcadnetworkimport/package-info.java
diff --git a/experimental/src/main/java/stockholm/ekocstrans/EkoCSTransProductionRunner.java b/experimental/src/main/java/stockholm/ekocstrans/EkoCSTransProductionRunner.java
diff --git a/experimental/src/main/java/stockholm/ihop4/IHOP4ProductionRunner.java b/experimental/src/main/java/stockholm/ihop4/IHOP4ProductionRunner.java
@@ -28,6 +28,7 @@
 import java.util.function.Consumer;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
@@ -63,6 +64,7 @@
 import org.matsim.core.controler.events.StartupEvent;
 import org.matsim.core.controler.listener.BeforeMobsimListener;
 import org.matsim.core.controler.listener.StartupListener;
+import org.matsim.core.events.EventsManagerImpl;
 import org.matsim.core.scenario.ScenarioUtils;
 import org.matsim.core.scoring.functions.ScoringParametersForPerson;
 
@@ -801,7 +803,8 @@ static void runWithSampersDynamics(final Config config) {
 
 		// 2020-08-14: changed while moving to MATSim 12
 		// OLD: controler.setModules(new ControlerDefaultsWithRoadPricingModule());
-		controler.setModules(new RoadPricingModule());
+		// controler.setModules(new RoadPricingModule());
+		controler.addOverridingModule(new RoadPricingModule());
 
 		controler.addOverridingModule(new SampersScoringFunctionModule());
 
@@ -817,6 +820,13 @@ public void install() {
 			}
 		});
 
+		controler.addControlerListener(new StartupListener() {			
+			@Override
+			public void notifyStartup(StartupEvent event) {
+				Logger.getLogger(EventsManagerImpl.class).setLevel(Level.OFF);								
+			}
+		});
+
 		controler.run();
 	}