fix: random seeds in secondary location model (eqasim-org#246)

sebhoerl · web-flow · commit be43c17f87ed · 2024-07-16T09:48:07.000+02:00
* fix: random seeds in secondary location model

* update hashes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 **Under development**
 
+- fix: secondary location model used same random seed in every parallel thread
 - feat: add a new method for attributing income to housholds using the bhepop2 package
 - fix: fixed special case in repairing ENTD for completely overlapping trips
 - feat: make it possible to disable the test run of MATSim before writing everything out
diff --git a/synthesis/population/spatial/secondary/locations.py b/synthesis/population/spatial/secondary/locations.py
@@ -131,7 +131,7 @@ def process(context, arguments):
   df_trips, df_primary, random_seed, crs = arguments
 
   # Set up RNG
-  random = np.random.RandomState(context.config("random_seed"))
+  random = np.random.RandomState(random_seed)
   maximum_iterations = context.config("secloc_maximum_iterations")
 
   # Set up discretization solver
diff --git a/tests/test_determinism.py b/tests/test_determinism.py
@@ -75,10 +75,10 @@ def _test_determinism(index, data_path, tmpdir):
     }
 
     REFERENCE_GPKG_HASHES = {
-        "ile_de_france_activities.gpkg":    "f8a4138f0dc92802d36ae30e449bfc74",
+        "ile_de_france_activities.gpkg":    "9cf9a5fd8927c709927f7a940f86efbf",
         "ile_de_france_commutes.gpkg":      "5a4180390a69349cc655c07c5671e8d3",
         "ile_de_france_homes.gpkg":         "033d1aa7a5350579cbd5e8213b9736f2",
-        "ile_de_france_trips.gpkg":         "5248a832eb56797b6f298c5aeb653dac",
+        "ile_de_france_trips.gpkg":         "d0aec4033cfc184bf1b91ae13a537ef8",
     }
 
     generated_csv_hashes = {

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,10 @@ def _test_determinism(index, data_path, tmpdir):`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`REFERENCE_GPKG_HASHES = {`
`78`		`- "ile_de_france_activities.gpkg": "f8a4138f0dc92802d36ae30e449bfc74",`
	`78`	`+ "ile_de_france_activities.gpkg": "9cf9a5fd8927c709927f7a940f86efbf",`
`79`	`79`	`"ile_de_france_commutes.gpkg": "5a4180390a69349cc655c07c5671e8d3",`
`80`	`80`	`"ile_de_france_homes.gpkg": "033d1aa7a5350579cbd5e8213b9736f2",`
`81`		`- "ile_de_france_trips.gpkg": "5248a832eb56797b6f298c5aeb653dac",`
	`81`	`+ "ile_de_france_trips.gpkg": "d0aec4033cfc184bf1b91ae13a537ef8",`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`generated_csv_hashes = {`