Merge branch 'master' into fix/drt-prebooking-variable-stop-durations…

…-group-size

contribs/bicycle/src/main/java/org/matsim/contrib/bicycle/BicycleScoreEventsCreator.java

@@ -132,7 +132,6 @@ class BicycleScoreEventsCreator implements
 	}
 
 	@Override public void handleEvent( VehicleLeavesTrafficEvent event ){
-		vehicle2driver.handleEvent( event );
 		if ( this.bicycleConfig.isMotorizedInteraction() ){
 			// dec count by one:
 			String mode = this.modeFromVehicle.get( event.getVehicleId() );
@@ -155,6 +154,8 @@ class BicycleScoreEventsCreator implements
 		} else {
 			log.warn( "no driver found for vehicleId=" + event.getVehicleId() + "; not clear why this could happen" );
 		}
+		// Needs to be called last, because it will remove driver information
+		vehicle2driver.handleEvent( event );
 		// ---
 	}
 

contribs/bicycle/src/test/java/org/matsim/contrib/bicycle/run/BicycleTest.java

@@ -48,6 +48,7 @@
 import org.matsim.core.controler.OutputDirectoryHierarchy.OverwriteFileSetting;
 import org.matsim.core.population.PopulationUtils;
 import org.matsim.core.population.io.PopulationReader;
+import org.matsim.core.population.routes.PopulationComparison;
 import org.matsim.core.router.TripStructureUtils;
 import org.matsim.core.scenario.ScenarioUtils;
 import org.matsim.core.utils.collections.CollectionUtils;
@@ -204,7 +205,8 @@ void testLane() {
 		Scenario scenarioCurrent = ScenarioUtils.createScenario(ConfigUtils.createConfig());
 		new PopulationReader(scenarioReference).readFile(utils.getInputDirectory() + "output_plans.xml.gz");
 		new PopulationReader(scenarioCurrent).readFile(utils.getOutputDirectory() + "output_plans.xml.gz");
-		assertTrue(PopulationUtils.equalPopulation(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
+
+		assertEquals(PopulationComparison.Result.equal, PopulationComparison.compare(scenarioReference.getPopulation(), scenarioCurrent.getPopulation()), "Populations are different");
 	}
 
 	@Test