Merge branch 'master' into renameAndImproveFreightAnalyses

matsim-org · Jan 15, 2025 · ab2bee8 · ab2bee8
2 parents 7e4e4a6 + 4550f28
commit ab2bee8
Showing 1 changed file with 39 additions and 48 deletions.
diff --git a/...ilsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java b/...ilsim/src/test/java/ch/sbb/matsim/contrib/railsim/integration/RailsimIntegrationTest.java
@@ -19,10 +19,19 @@
 
 package ch.sbb.matsim.contrib.railsim.integration;
 
-import ch.sbb.matsim.contrib.railsim.RailsimModule;
-import ch.sbb.matsim.contrib.railsim.events.RailsimDetourEvent;
-import ch.sbb.matsim.contrib.railsim.events.RailsimTrainStateEvent;
-import ch.sbb.matsim.contrib.railsim.qsimengine.RailsimQSimModule;
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -42,9 +51,7 @@
 import org.matsim.core.config.groups.ScoringConfigGroup;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.Controler;
-import org.matsim.core.events.handler.EventHandler;
 import org.matsim.core.gbl.MatsimRandom;
-import org.matsim.core.mobsim.framework.listeners.MobsimListener;
 import org.matsim.core.scenario.ScenarioUtils;
 import org.matsim.core.utils.io.IOUtils;
 import org.matsim.examples.ExamplesUtils;
@@ -58,26 +65,10 @@
 import org.matsim.vehicles.Vehicle;
 import org.matsim.vehicles.VehicleType;
 
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
+import ch.sbb.matsim.contrib.railsim.RailsimModule;
+import ch.sbb.matsim.contrib.railsim.events.RailsimDetourEvent;
+import ch.sbb.matsim.contrib.railsim.events.RailsimTrainStateEvent;
+import ch.sbb.matsim.contrib.railsim.qsimengine.RailsimQSimModule;
 
 public class RailsimIntegrationTest {
 
@@ -404,28 +395,28 @@ void testMicroStationReroutingConcurrent() {
 
 	@Test
 	void testMicroStationReroutingTwoDirections() {
-//		modifyScheduleAndRunSimulation(new File(utils.getPackageInputDirectory(), "microStationReroutingTwoDirections"), 300, 1800);
-
-        ExecutorService executor = Executors.newSingleThreadExecutor();
-        Future<?> future = executor.submit(() -> {
-            modifyScheduleAndRunSimulation(
-                new File(utils.getPackageInputDirectory(), "microStationReroutingTwoDirections"),
-                300,
-                1800
-            );
-        });
-
-        try {
-            future.get(30, TimeUnit.SECONDS);
-        } catch (TimeoutException e) {
-            future.cancel(true);
-            fail("Simulation took too long and was aborted!");
-        } catch (ExecutionException | InterruptedException e) {
-        	// other exceptions
-        	fail("An error occurred during the simulation: " + e.getMessage());
-        } finally {
-            executor.shutdownNow();
-        }
+		modifyScheduleAndRunSimulation(new File(utils.getPackageInputDirectory(), "microStationReroutingTwoDirections"), 300, 900);
+
+//        ExecutorService executor = Executors.newSingleThreadExecutor();
+//        Future<?> future = executor.submit(() -> {
+//            modifyScheduleAndRunSimulation(
+//                new File(utils.getPackageInputDirectory(), "microStationReroutingTwoDirections"),
+//                300,
+//                1800
+//            );
+//        });
+//
+//        try {
+//            future.get(30, TimeUnit.SECONDS);
+//        } catch (TimeoutException e) {
+//            future.cancel(true);
+//            fail("Simulation took too long and was aborted!");
+//        } catch (ExecutionException | InterruptedException e) {
+//        	// other exceptions
+//        	fail("An error occurred during the simulation: " + e.getMessage());
+//        } finally {
+//            executor.shutdownNow();
+//        }
 	}
 
 	@Test