Improve performances

Merge pull request #905 from openfisca/improve-perf-ipp

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 34.4.2 [#905](https://github.com/openfisca/openfisca-core/pull/905)
+
+- Fix minor errors that result in operations being uselessly repeated over and over.
+
 ### 34.4.1 [#904](https://github.com/openfisca/openfisca-core/pull/904)
 
 - Improve performance graph introduced in 34.4.0

openfisca_core/periods.py

@@ -8,6 +8,9 @@
 
 Since a period is a triple it can be used as a dictionary key.
 """
+
+from __future__ import annotations
+
 import calendar
 import datetime
 import re
@@ -567,12 +570,10 @@ def offset(self, offset, unit = None):
         """
         return self.__class__((self[0], self[1].offset(offset, self[0] if unit is None else unit), self[2]))
 
-    def contains(self, other):
+    def contains(self, other: Period) -> bool:
         """
             Returns ``True`` if the period contains ``other``. For instance, ``period(2015)`` contains ``period(2015-01)``
         """
-        if not isinstance(other, Period):
-            other = period(other)
         return self.start <= other.start and self.stop >= other.stop
 
     @property
@@ -619,7 +620,7 @@ def size_in_days(self):
         raise ValueError("Cannot calculate number of days in {0}".format(unit))
 
     @property
-    def start(self):
+    def start(self) -> Instant:
         """Return the first day of the period as an Instant instance.
 
         >>> period('month', '2012-2-29', 4).start
@@ -628,7 +629,7 @@ def start(self):
         return self[1]
 
     @property
-    def stop(self):
+    def stop(self) -> Instant:
         """Return the last day of the period as an Instant instance.
 
         >>> period('year', 2014).stop

openfisca_core/populations.py

@@ -272,7 +272,7 @@ def ordered_members_map(self):
         This function only caches the map value, to see what the map is used for, see value_nth_person method.
         """
         if self._ordered_members_map is None:
-            return np.argsort(self.members_entity_id)
+            self._ordered_members_map = np.argsort(self.members_entity_id)
         return self._ordered_members_map
 
     def get_role(self, role_name):

openfisca_core/simulations.py

@@ -158,6 +158,7 @@ def purge_cache_of_invalid_values(self):
         for (_name, _period) in self.invalidated_caches:
             holder = self.get_holder(_name)
             holder.delete_arrays(_period)
+        self.invalidated_caches = set()
 
     def calculate_add(self, variable_name, period):
         variable = self.tax_benefit_system.get_variable(variable_name, check_existence = True)

setup.py

@@ -37,7 +37,7 @@
 
 setup(
     name = 'OpenFisca-Core',
-    version = '34.4.1',
+    version = '34.4.2',
     author = 'OpenFisca Team',
     author_email = 'contact@openfisca.org',
     classifiers = [