Merge pull request #51 from PolicyEngine/mapping

Fix mapping bug

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.2] - 2022-04-25
+
+### Fixed
+
+* Adding a `target` entity to `IndividualSim.calc` now functions correctly when `target` has a different entity type than `variable`.
+* Adds `MANIFEST.in` to the repo.
+
 ## [0.10.1] - 2022-04-24
 
 ### Fixed

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include openfisca_tools *

openfisca_tools/hypothetical.py

@@ -275,22 +275,20 @@ def calc(
             self.apply_reform(reform)
             self.build()
 
-        if map_to is None and target is not None:
-            map_to = self.get_entity(target).key
-
         period = period or self.year
         entity = self.system.variables[var].entity
-        if target is not None:
-            target_entity = self.get_entity(target)
-            if target_entity.key != entity.key:
-                target = self.get_group(entity, target)
         try:
             result = self.simulation.calculate(var, period)
         except:
             try:
                 result = self.sim.calculate_add(var, period)
             except:
                 result = self.simulation.calculate_divide(var, period)
+        if (
+            target is not None
+            and target not in self.situation_data[entity.plural]
+        ):
+            map_to = self.get_entity(target).key
         if map_to is not None:
             result = self.map_to(result, entity.key, map_to)
             entity = self.entities[map_to]

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="OpenFisca-Tools",
-    version="0.10.1",
+    version="0.10.2",
     author="PolicyEngine",
     license="http://www.fsf.org/licensing/licenses/agpl-3.0.html",
     url="https://github.com/policyengine/openfisca-tools",