Skip to content

reduce unwanted randomness #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kainagel merged 6 commits into from
Apr 21, 2026
Merged

reduce unwanted randomness #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d59e430
replace all HashMap by LinkedHashMap. With the former, the sequence …
kainagel Apr 21, 2026
9f2022d
see if the fabiland test now goes one step further
kainagel Apr 21, 2026
d44372f
switch of threading in MovesModelImpl
kainagel Apr 21, 2026
bbd22c7
make a non-final static variable non-static
kainagel Apr 21, 2026
ccc3cf6
Merge branch 'master' into kn/reduceUnwantedRandomness
kainagel Apr 21, 2026
2897ab3
comment in more assertions
kainagel Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions analysis/src/main/java/sdg/SDGCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ public class SDGCalculator {
private Collection<Dwelling> dwellings = new ArrayList<>();
private Collection<Person> persons = new ArrayList<>();
private RealEstateDataManager realEstateDataManager;
private Map<Integer, List<Household>> hhByZone = new HashMap<>();
private Map<Integer, List<Person>> ppByZone = new HashMap<>();
private Map<Integer, List<Dwelling>> ddByZone = new HashMap<>();
private Map<Integer, AnalyzedPerson> matsimPerson = new HashMap<>();
private Map<Integer, List<Trip>> commutingTripsByZone = new HashMap<>();
private Map<Integer, List<Trip>> schoolTripsByZone = new HashMap<>();
private Map<Integer, Map<Mode, List<Trip>>> ttByModeByZone = new HashMap<>();
private Map<Integer, List<Household>> hhByZone = new LinkedHashMap<>();
private Map<Integer, List<Person>> ppByZone = new LinkedHashMap<>();
private Map<Integer, List<Dwelling>> ddByZone = new LinkedHashMap<>();
private Map<Integer, AnalyzedPerson> matsimPerson = new LinkedHashMap<>();
private Map<Integer, List<Trip>> commutingTripsByZone = new LinkedHashMap<>();
private Map<Integer, List<Trip>> schoolTripsByZone = new LinkedHashMap<>();
private Map<Integer, Map<Mode, List<Trip>>> ttByModeByZone = new LinkedHashMap<>();

public void setMatsimPerson(Map<Integer, AnalyzedPerson> matsimPerson) {
this.matsimPerson = matsimPerson;
Expand Down
3 changes: 2 additions & 1 deletion analysis/src/main/java/sdg/reader/CongestionEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import sdg.data.AnalyzedPerson;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class CongestionEventHandler implements LinkEnterEventHandler, LinkLeaveEventHandler, VehicleLeavesTrafficEventHandler {
Expand All @@ -23,7 +24,7 @@ public Map<Integer, AnalyzedPerson> getPersons() {
return persons;
}

private Map<Integer, AnalyzedPerson> persons = new HashMap<>();
private Map<Integer, AnalyzedPerson> persons = new LinkedHashMap<>();

public CongestionEventHandler(Network network) {
this.network = network;
Expand Down
7 changes: 4 additions & 3 deletions .../main/java/de/tum/bgu/msm/health/airPollutant/dispersion/EmissionsOnLinkEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.matsim.contrib.emissions.events.WarmEmissionEventHandler;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

/**
Expand Down Expand Up @@ -41,7 +42,7 @@ public void reset(int iteration) {

@Override
public void handleEvent(WarmEmissionEvent event) {
Map<Pollutant,Double> map = new HashMap<>() ;
Map<Pollutant,Double> map = new LinkedHashMap<>() ;
for( Map.Entry<Pollutant, Double> entry : event.getWarmEmissions().entrySet() ){
map.put( entry.getKey(), entry.getValue() ) ;
}
Expand All @@ -59,10 +60,10 @@ private void handleEmissionEvent(double time, Id<Link> linkId, Map<Pollutant, Do
TimeBinMap.TimeBin<Map<Id<Link>, EmissionsByPollutant>> currentBin = timeBins.getTimeBin(time);

if (!currentBin.hasValue()){
currentBin.setValue( new HashMap<>() );
currentBin.setValue( new LinkedHashMap<>() );
}
if (!currentBin.getValue().containsKey(linkId)){
currentBin.getValue().put( linkId, new EmissionsByPollutant( new HashMap<>( emissions ) ) );
currentBin.getValue().put( linkId, new EmissionsByPollutant( new LinkedHashMap<>( emissions ) ) );
} else{
currentBin.getValue().get( linkId ).addEmissions( emissions );
}
Expand Down
5 changes: 3 additions & 2 deletions ...ions/health/src/main/java/de/tum/bgu/msm/health/airPollutant/emission/AnalyzedObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.matsim.contrib.emissions.Pollutant;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class AnalyzedObject<T> {
Expand All @@ -13,8 +14,8 @@ public class AnalyzedObject<T> {

public AnalyzedObject(Id<T> id) {
this.id = id;
this.warmEmissions = new HashMap<>();
this.coldEmissions = new HashMap<>();
this.warmEmissions = new LinkedHashMap<>();
this.coldEmissions = new LinkedHashMap<>();
}

public Map<Pollutant, Double> getWarmEmissions() {
Expand Down
5 changes: 3 additions & 2 deletions ...health/src/main/java/de/tum/bgu/msm/health/airPollutant/emission/LinkEmissionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.matsim.vehicles.Vehicle;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class LinkEmissionHandler implements WarmEmissionEventHandler, ColdEmissionEventHandler {
Expand All @@ -26,8 +27,8 @@ public class LinkEmissionHandler implements WarmEmissionEventHandler, ColdEmissi

public LinkEmissionHandler(Network network) {
this.network = network;
emmisionsByLink = new HashMap<>();
emmisionsByVehicle = new HashMap<>();
emmisionsByLink = new LinkedHashMap<>();
emmisionsByVehicle = new LinkedHashMap<>();
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion extensions/health/src/main/java/de/tum/bgu/msm/health/data/ActivityLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.matsim.contrib.emissions.Pollutant;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class ActivityLocation {
Expand All @@ -13,7 +14,7 @@ public class ActivityLocation {

private final Coordinate coordinate;

private Map<Pollutant, OpenIntFloatHashMap> exposure2Pollutant2TimeBin = new HashMap<>();
private Map<Pollutant, OpenIntFloatHashMap> exposure2Pollutant2TimeBin = new LinkedHashMap<>();

private OpenIntFloatHashMap noiseLevel2TimeBin = new OpenIntFloatHashMap();

Expand Down
5 changes: 3 additions & 2 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/data/LinkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@
import org.matsim.contrib.emissions.Pollutant;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class LinkInfo {

private final Id<Link> linkId;

private Map<AccidentType, OpenIntFloatHashMap> severeFatalCasualityExposureByAccidentTypeByTime = new HashMap<>();
private Map<AccidentType, OpenIntFloatHashMap> severeFatalCasualityExposureByAccidentTypeByTime = new LinkedHashMap<>();

private Map<Pollutant, OpenIntFloatHashMap> exposure2Pollutant2TimeBin = new HashMap<>();
private Map<Pollutant, OpenIntFloatHashMap> exposure2Pollutant2TimeBin = new LinkedHashMap<>();

private OpenIntFloatHashMap noiseLevel2TimeBin = new OpenIntFloatHashMap();

Expand Down
3 changes: 2 additions & 1 deletion extensions/health/src/main/java/de/tum/bgu/msm/health/data/RelativeRisks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
import de.tum.bgu.msm.data.Mode;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

// Dose-response functions for health exposures (simple for now but will become more complex)
public class RelativeRisks {

public static Map<String, Float> calculate(PersonHealth personHealth) {
Map<String, Float> relativeRisks = new HashMap<>();
Map<String, Float> relativeRisks = new LinkedHashMap<>();

relativeRisks.put("walk", (float) walk(personHealth.getWeeklyMarginalMetHours(Mode.walk)));
relativeRisks.put("cycle", (float) bike(personHealth.getWeeklyMarginalMetHours(Mode.bicycle)));
Expand Down
7 changes: 4 additions & 3 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/data/Trip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

/**
Expand Down Expand Up @@ -44,12 +45,12 @@ public class Trip implements Id {
private double matsimTravelDistance = 0.;

private double marginalMetHours = 0.;
private Map<String, Float> travelRiskMap = new HashMap<>();
private Map<String, Float> travelExposureMap = new HashMap<>();
private Map<String, Float> travelRiskMap = new LinkedHashMap<>();
private Map<String, Float> travelExposureMap = new LinkedHashMap<>();
private double travelNoiseExposure = 0.;
private double travelNdviExposure = 0.;

private Map<String, Float> activityExposureMap = new HashMap<>();
private Map<String, Float> activityExposureMap = new LinkedHashMap<>();
private double activityNoiseExposure = 0.;
private double activityNdviExposure = 0.;

Expand Down
3 changes: 2 additions & 1 deletion extensions/health/src/main/java/de/tum/bgu/msm/health/injury/AccidentAgentInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
import org.matsim.api.core.v01.network.Link;
import org.matsim.api.core.v01.population.Person;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class AccidentAgentInfo {

private final Id<Person> personId;
private final Map<Id<Link>, Map<Integer, String>> linkId2time2mode = new HashMap<>();
private final Map<Id<Link>, Map<Integer, String>> linkId2time2mode = new LinkedHashMap<>();
private double lightInjuryRisk;
private double severeInjuryRisk;

Expand Down
15 changes: 8 additions & 7 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/injury/AccidentLinkInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.matsim.api.core.v01.network.Link;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

/**
Expand All @@ -35,19 +36,19 @@ public class AccidentLinkInfo {

private final Id<Link> linkId;

private final Map<Integer, TimeBinInfo> timeSpecificInfo = new HashMap<>();
private final Map<Integer, TimeBinInfo> timeSpecificInfo = new LinkedHashMap<>();

// private Map<AccidentType, Map<Integer, Double>> lightCrashRateByAccidentTypeByTime = new HashMap<>();
// private Map<AccidentType, Map<Integer, Double>> lightCrashRateByAccidentTypeByTime = new LinkedHashMap<>();
//
// private Map<AccidentType, Map<Integer, Double>> severeFatalCrashRateByAccidentTypeByTime = new HashMap<>();
// private Map<AccidentType, Map<Integer, Double>> severeFatalCrashRateByAccidentTypeByTime = new LinkedHashMap<>();
//
// private Map<AccidentType, Map<Integer, Double>> lightCasualityRateByAccidentTypeByTime = new HashMap<>();
// private Map<AccidentType, Map<Integer, Double>> lightCasualityRateByAccidentTypeByTime = new LinkedHashMap<>();
//
// private Map<AccidentType, Map<Integer, Double>> severeFatalCasualityRateByAccidentTypeByTime = new HashMap<>();
// private Map<AccidentType, Map<Integer, Double>> severeFatalCasualityRateByAccidentTypeByTime = new LinkedHashMap<>();

private Map<AccidentType, OpenIntFloatHashMap> lightCasualityExposureByAccidentTypeByTime = new HashMap<>();
private Map<AccidentType, OpenIntFloatHashMap> lightCasualityExposureByAccidentTypeByTime = new LinkedHashMap<>();

private Map<AccidentType, OpenIntFloatHashMap> severeFatalCasualityExposureByAccidentTypeByTime = new HashMap<>();
private Map<AccidentType, OpenIntFloatHashMap> severeFatalCasualityExposureByAccidentTypeByTime = new LinkedHashMap<>();

public AccidentLinkInfo(Id<Link> linkId) {
this.linkId = linkId;
Expand Down
5 changes: 3 additions & 2 deletions ...health/src/main/java/de/tum/bgu/msm/health/injury/AccidentRateModelCoefficientReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

public class AccidentRateModelCoefficientReader {
Expand All @@ -15,8 +16,8 @@ public class AccidentRateModelCoefficientReader {
private AccidentType accidentType;
private AccidentSeverity accidentSeverity;
private String path;
private final Map<String, Double> coefficients = new HashMap<>();
private final Map<Integer, Double> timeOfDayDistribution = new HashMap<>();
private final Map<String, Double> coefficients = new LinkedHashMap<>();
private final Map<Integer, Double> timeOfDayDistribution = new LinkedHashMap<>();

public AccidentRateModelCoefficientReader(AccidentType accidentType, AccidentSeverity accidentSeverity, String path) {
this.accidentType = accidentType;
Expand Down
5 changes: 3 additions & 2 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/injury/AccidentsContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.matsim.api.core.v01.population.Person;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;

/**
Expand All @@ -37,9 +38,9 @@ public final class AccidentsContext {
@Inject AccidentsContext(){}
// injected constructor is package-private so that nobody can instantiate this class directly

private Map<Id<Link>, AccidentLinkInfo> linkId2info = new HashMap<>();
private Map<Id<Link>, AccidentLinkInfo> linkId2info = new LinkedHashMap<>();

private Map<Id<Person>, AccidentAgentInfo> personId2info = new HashMap<>();
private Map<Id<Person>, AccidentAgentInfo> personId2info = new LinkedHashMap<>();

public Map<Id<Link>, AccidentLinkInfo> getLinkId2info() {
return linkId2info;
Expand Down
23 changes: 10 additions & 13 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/injury/AnalysisEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,19 @@
import org.matsim.core.events.handler.EventHandler;
import org.matsim.vehicles.Vehicle;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
* @author ikaddoura
*/

public class AnalysisEventHandler implements EventHandler, LinkLeaveEventHandler, PersonEntersVehicleEventHandler, PersonDepartureEventHandler {

private final Map<Id<Link>, Map<Integer, Integer>> linkId2time2leavingAgents = new HashMap<>();
private final Map<Id<Link>, Map<Integer, List<Id<Person>>>> linkId2time2personIds = new HashMap<>();
private final Map<Id<Vehicle>, Id<Person>> vehicleId2personId = new HashMap<>();
private final Map<Id<Link>, Map<String, Map<Integer, Integer>>> linkId2mode2time2leavingAgents = new HashMap<>();
private final Map<Id<Person>, String> personId2legMode = new HashMap<>();
private final Map<Id<Link>, Map<Integer, Integer>> linkId2time2leavingAgents = new LinkedHashMap<>();
private final Map<Id<Link>, Map<Integer, List<Id<Person>>>> linkId2time2personIds = new LinkedHashMap<>();
private final Map<Id<Vehicle>, Id<Person>> vehicleId2personId = new LinkedHashMap<>();
private final Map<Id<Link>, Map<String, Map<Integer, Integer>>> linkId2mode2time2leavingAgents = new LinkedHashMap<>();
private final Map<Id<Person>, String> personId2legMode = new LinkedHashMap<>();


@Inject AnalysisEventHandler(){}
Expand Down Expand Up @@ -89,13 +86,13 @@ public void handleEvent(LinkLeaveEvent event) {
linkId2mode2time2leavingAgents.get(linkId).get(legMode).put(timeBinNr, 1);
}
} else {
Map<Integer,Integer> time2leavingAgents = new HashMap<>();
Map<Integer,Integer> time2leavingAgents = new LinkedHashMap<>();
time2leavingAgents.put(timeBinNr,1);
linkId2mode2time2leavingAgents.get(linkId).put(legMode, time2leavingAgents);
}
} else {
Map<String, Map<Integer,Integer>> mode2time2leavingAgents = new HashMap<>();
Map<Integer,Integer> time2leavingAgents = new HashMap<>();
Map<String, Map<Integer,Integer>> mode2time2leavingAgents = new LinkedHashMap<>();
Map<Integer,Integer> time2leavingAgents = new LinkedHashMap<>();
time2leavingAgents.put(timeBinNr,1);
mode2time2leavingAgents.put(legMode,time2leavingAgents);
linkId2mode2time2leavingAgents.put(linkId, mode2time2leavingAgents);
Expand All @@ -110,7 +107,7 @@ public void handleEvent(LinkLeaveEvent event) {
if(personInfo.getLinkId2time2mode().get(linkId)!=null){
personInfo.getLinkId2time2mode().get(linkId).put(hour, legMode);
}else{
Map<Integer, String> time2Mode = new HashMap<>();
Map<Integer, String> time2Mode = new LinkedHashMap<>();
time2Mode.put(hour, legMode);
personInfo.getLinkId2time2mode().put(linkId, time2Mode);
}
Expand Down
17 changes: 9 additions & 8 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/injury/AnalysisEventHandlerOnline.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.matsim.vehicles.Vehicle;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

Expand All @@ -43,11 +44,11 @@

public final class AnalysisEventHandlerOnline extends AnalysisEventHandler {

/*private final Map<Id<Link>, Map<Integer, Integer>> linkId2time2leavingAgents = new HashMap<>();
private final Map<Id<Link>, Map<Integer, List<Id<Person>>>> linkId2time2personIds = new HashMap<>();*/
private final Map<Id<Vehicle>, Id<Person>> vehicleId2personId = new HashMap<>();
private final Map<Id<Link>, Map<String, Map<Integer, Integer>>> linkId2mode2time2leavingAgents = new HashMap<>();
private final Map<Id<Person>, String> personId2legMode = new HashMap<>();
/*private final Map<Id<Link>, Map<Integer, Integer>> linkId2time2leavingAgents = new LinkedHashMap<>();
private final Map<Id<Link>, Map<Integer, List<Id<Person>>>> linkId2time2personIds = new LinkedHashMap<>();*/
private final Map<Id<Vehicle>, Id<Person>> vehicleId2personId = new LinkedHashMap<>();
private final Map<Id<Link>, Map<String, Map<Integer, Integer>>> linkId2mode2time2leavingAgents = new LinkedHashMap<>();
private final Map<Id<Person>, String> personId2legMode = new LinkedHashMap<>();


@Inject
Expand Down Expand Up @@ -89,13 +90,13 @@ public void handleEvent(LinkLeaveEvent event) {
linkId2mode2time2leavingAgents.get(linkId).get(legMode).put(timeBinNr, 1);
}
} else {
Map<Integer,Integer> time2leavingAgents = new HashMap<>();
Map<Integer,Integer> time2leavingAgents = new LinkedHashMap<>();
time2leavingAgents.put(timeBinNr,1);
linkId2mode2time2leavingAgents.get(linkId).put(legMode, time2leavingAgents);
}
} else {
Map<String, Map<Integer,Integer>> mode2time2leavingAgents = new HashMap<>();
Map<Integer,Integer> time2leavingAgents = new HashMap<>();
Map<String, Map<Integer,Integer>> mode2time2leavingAgents = new LinkedHashMap<>();
Map<Integer,Integer> time2leavingAgents = new LinkedHashMap<>();
time2leavingAgents.put(timeBinNr,1);
mode2time2leavingAgents.put(legMode,time2leavingAgents);
linkId2mode2time2leavingAgents.put(linkId, mode2time2leavingAgents);
Expand Down
2 changes: 1 addition & 1 deletion extensions/health/src/main/java/de/tum/bgu/msm/health/io/HealthTransitionTableReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public EnumMap<Diseases, Map<String, Double>> readData(DataContainerHealth dataC

String compositeKey = dataContainer.createTransitionLookupIndex(age,gender,location);

healthDiseaseData.computeIfAbsent(diseases, k -> new HashMap<>()).put(compositeKey, prob);
healthDiseaseData.computeIfAbsent(diseases, k -> new LinkedHashMap<>()).put(compositeKey, prob);

}
} catch (IOException e) {
Expand Down
6 changes: 3 additions & 3 deletions extensions/health/src/main/java/de/tum/bgu/msm/health/io/SportPAmodelCoefficientReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public class SportPAmodelCoefficientReader {
public Map<String,Map<String,Double>> readData(String fileName) {
logger.info("Reading sport PA model coefficient from csv file");

Map<String,Map<String,Double>> coef = new HashMap<>();
coef.put("zero", new HashMap<>());
coef.put("linear", new HashMap<>());
Map<String,Map<String,Double>> coef = new LinkedHashMap<>();
coef.put("zero", new LinkedHashMap<>());
coef.put("linear", new LinkedHashMap<>());


String recString = "";
Expand Down
Loading
Loading