OpenFisca-Core 45.0.4__tar.gz → 45.0.5__tar.gz

{openfisca_core-45.0.4 → openfisca_core-45.0.5}/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+### 45.0.5 [#1387](https://github.com/openfisca/openfisca-core/pull/1387)
+
+#### Bug fixes
+
+- Fix `restore_simulation` rebuilding entity counts from the members mapping instead of the dumped ids.
+  - A group entity with no member was silently dropped from the restored simulation's `count` (while still listed in `ids`), so subsequent calculations returned arrays with missing entities — or failed with a `ValueError` when a value had been stored for the group entity.
+  - Restoring a simulation whose tax and benefit system has no group entity raised an `UnboundLocalError`.
+  - Each entity's `count` is now restored from its dumped `ids`.
+
 ### 45.0.4 [#1397](https://github.com/openfisca/openfisca-core/pull/1397)
 
 #### Technical changes

{openfisca_core-45.0.4 → openfisca_core-45.0.5/OpenFisca_Core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-Core
-Version: 45.0.4
+Version: 45.0.5
 Summary: A versatile microsimulation free software
 Home-page: https://github.com/openfisca/openfisca-core
 Author: OpenFisca Team

{openfisca_core-45.0.4/OpenFisca_Core.egg-info → openfisca_core-45.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenFisca-Core
-Version: 45.0.4
+Version: 45.0.5
 Summary: A versatile microsimulation free software
 Home-page: https://github.com/openfisca/openfisca-core
 Author: OpenFisca Team

{openfisca_core-45.0.4 → openfisca_core-45.0.5}/openfisca_core/tools/simulation_dumper.py

@@ -41,15 +41,7 @@ def restore_simulation(directory, tax_benefit_system, **kwargs):
 
     entities_dump_dir = os.path.join(directory, "__entities__")
     for population in simulation.populations.values():
-        if population.entity.is_person:
-            continue
-        person_count = _restore_entity(population, entities_dump_dir)
-
-    for population in simulation.populations.values():
-        if not population.entity.is_person:
-            continue
         _restore_entity(population, entities_dump_dir)
-        population.count = person_count
 
     variables_to_restore = (
         variable for variable in os.listdir(directory) if variable != "__entities__"
@@ -92,13 +84,16 @@ def _dump_entity(population, directory) -> None:
     numpy.save(os.path.join(path, "members_role.npy"), encoded_roles)
 
 
-def _restore_entity(population, directory):
+def _restore_entity(population, directory) -> None:
     path = os.path.join(directory, population.entity.key)
 
     population.ids = numpy.load(os.path.join(path, "id.npy"))
+    # The number of entities cannot be inferred from the members mapping, as
+    # a group entity may have no member at all: use the dumped ids instead.
+    population.count = len(population.ids)
 
     if population.entity.is_person:
-        return None
+        return
 
     population.members_position = numpy.load(os.path.join(path, "members_position.npy"))
     population.members_entity_id = numpy.load(
@@ -115,9 +110,6 @@ def _restore_entity(population, directory):
             list(flattened_roles),
             default=None,
         )
-    person_count = len(population.members_entity_id)
-    population.count = max(population.members_entity_id) + 1
-    return person_count
 
 
 def _restore_holder(simulation, variable_name, directory) -> None:

{openfisca_core-45.0.4 → openfisca_core-45.0.5}/setup.py

@@ -65,7 +65,7 @@ dev_requirements = [
 
 setup(
     name="OpenFisca-Core",
-    version="45.0.4",
+    version="45.0.5",
     author="OpenFisca Team",
     author_email="contact@openfisca.org",
     classifiers=[