fix(simulations): build uses group populations

openfisca · Sep 16, 2024 · f90c6e5 · f90c6e5
1 parent 5e7d60b
commit f90c6e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/openfisca_core/simulations/_build_default_simulation.py b/openfisca_core/simulations/_build_default_simulation.py
@@ -5,9 +5,9 @@
 import numpy
 
 from .simulation import Simulation
-from .types import CoreEntity, CorePopulation, TaxBenefitSystem
+from .types import CoreEntity, GroupPopulation, TaxBenefitSystem
 
-Populations: TypeAlias = dict[str, CorePopulation[CoreEntity]]
+Populations: TypeAlias = dict[str, GroupPopulation[CoreEntity]]
 
 
 class _BuildDefaultSimulation:

diff --git a/openfisca_core/simulations/_build_from_variables.py b/openfisca_core/simulations/_build_from_variables.py
@@ -10,9 +10,9 @@
 from ._build_default_simulation import _BuildDefaultSimulation
 from ._guards import is_variable_dated
 from .simulation import Simulation
-from .types import CoreEntity, CorePopulation, TaxBenefitSystem, Variables
+from .types import CoreEntity, GroupPopulation, TaxBenefitSystem, Variables
 
-Populations: TypeAlias = dict[str, CorePopulation[CoreEntity]]
+Populations: TypeAlias = dict[str, GroupPopulation[CoreEntity]]
 
 
 class _BuildFromVariables:

diff --git a/openfisca_core/simulations/types.py b/openfisca_core/simulations/types.py
@@ -112,9 +112,7 @@ class Period(t.Period, Protocol):
 
 
 class CorePopulation(t.CorePopulation, Protocol[D]):
-    count: int
     entity: D
-    ids: t.Array[String]
 
     def get_holder(self, __variable_name: str) -> Holder[V]:
         ...
@@ -213,7 +211,7 @@ def get_variable(
 
     def instantiate_entities(
         self,
-    ) -> dict[str, SinglePopulation[E]]:
+    ) -> dict[str, GroupPopulation[E]]:
         ...
 
 

diff --git a/openfisca_core/types.py b/openfisca_core/types.py
@@ -125,7 +125,9 @@ def unit(self) -> Any:
 
 
 class CorePopulation(Protocol):
+    count: int
     entity: Any
+    ids: Array[numpy.str_]
 
     @abc.abstractmethod
     def get_holder(self, variable_name: Any) -> Any: