Change _lsr to _behavioral_response

CHANGELOG.md

@@ -5,18 +5,6 @@ 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).
 
-## [1.137.3] - 2024-11-01 16:53:33
-
-### Fixed
-
-- Colorado 2023 sales tax refund.
-
-## [1.137.2] - 2024-11-01 10:27:40
-
-### Fixed
-
-- Branch improvements.
-
 ## [1.137.1] - 2024-10-31 18:57:07
 
 ### Fixed
@@ -10132,8 +10120,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
-[1.137.3]: https://github.com/PolicyEngine/policyengine-us/compare/1.137.2...1.137.3
-[1.137.2]: https://github.com/PolicyEngine/policyengine-us/compare/1.137.1...1.137.2
 [1.137.1]: https://github.com/PolicyEngine/policyengine-us/compare/1.137.0...1.137.1
 [1.137.0]: https://github.com/PolicyEngine/policyengine-us/compare/1.136.2...1.137.0
 [1.136.2]: https://github.com/PolicyEngine/policyengine-us/compare/1.136.1...1.136.2

changelog.yaml

@@ -8580,13 +8580,3 @@
     fixed:
     - remove uprating for SNAP variables that don't change
   date: 2024-10-31 18:57:07
-- bump: patch
-  changes:
-    fixed:
-    - Branch improvements.
-  date: 2024-11-01 10:27:40
-- bump: patch
-  changes:
-    fixed:
-    - Colorado 2023 sales tax refund.
-  date: 2024-11-01 16:53:33

changelog_entry.yaml

@@ -0,0 +1,4 @@
+- bump: minor
+  changes:
+    fixed:
+      - Change _lsr to _behavioral_response.

policyengine_us/parameters/gov/states/co/tax/income/credits/sales_tax_refund/amount/amount.yaml

@@ -1,13 +1,13 @@
 description: Colorado provides a flat sales tax refund credit of this amount.
 values:
-  2023-01-01: 800
+  2023-01-01: 661
 
 metadata:
   period: year
   unit: year 
   label: Colorado sales tax refund credit flat amount
   reference:
-    - title: 2023 Colorado Individual Tax Filing Guide 104 Book, Line 34
-      href: https://tax.colorado.gov/sites/tax/files/documents/Book0104_2023.pdf#page=9
+    - title: 2023 Colorado Individual Income Tax Filing Guide
+      href: https://leg.colorado.gov/sites/default/files/documents/2023A/bills/fn/2023a_hb1311_00.pdf#page=3
     - title: Colorado General Assembly HB23-1311 Identical Temporary TABOR Refund
       href: https://leg.colorado.gov/bills/hb23-1311#:~:text=The%20act%20creates%20a%20new,2022%2D23%20state%20fiscal%20year

policyengine_us/system.py

@@ -106,22 +106,30 @@ def __init__(self, *args, **kwargs):
         employment_income = self.get_holder("employment_income")
         for known_period in employment_income.get_known_periods():
             array = employment_income.get_array(known_period)
-            self.set_input("employment_income_before_lsr", known_period, array)
+            self.set_input(
+                "employment_income_before_behavioral_response",
+                known_period,
+                array,
+            )
             employment_income.delete_arrays(known_period)
 
         self_employment_income = self.get_holder("self_employment_income")
         for known_period in employment_income.get_known_periods():
             array = self_employment_income.get_array(known_period)
             self.set_input(
-                "self_employment_income_before_lsr", known_period, array
+                "self_employment_income_before_behavioral_response",
+                known_period,
+                array,
             )
             self_employment_income.delete_arrays(known_period)
 
         weekly_hours = self.get_holder("weekly_hours_worked")
         for known_period in weekly_hours.get_known_periods():
             array = weekly_hours.get_array(known_period)
             self.set_input(
-                "weekly_hours_worked_before_lsr", known_period, array
+                "weekly_hours_worked_before_behavioral_response",
+                known_period,
+                array,
             )
             weekly_hours.delete_arrays(known_period)
 
@@ -160,22 +168,30 @@ def __init__(self, *args, **kwargs):
         employment_income = self.get_holder("employment_income")
         for known_period in employment_income.get_known_periods():
             array = employment_income.get_array(known_period)
-            self.set_input("employment_income_before_lsr", known_period, array)
+            self.set_input(
+                "employment_income_before_behavioral_response",
+                known_period,
+                array,
+            )
             employment_income.delete_arrays(known_period)
 
         self_employment_income = self.get_holder("self_employment_income")
         for known_period in self_employment_income.get_known_periods():
             array = self_employment_income.get_array(known_period)
             self.set_input(
-                "self_employment_income_before_lsr", known_period, array
+                "self_employment_income_before_behavioral_response",
+                known_period,
+                array,
             )
             self_employment_income.delete_arrays(known_period)
 
         weekly_hours = self.get_holder("weekly_hours_worked")
         for known_period in weekly_hours.get_known_periods():
             array = weekly_hours.get_array(known_period)
             self.set_input(
-                "weekly_hours_worked_before_lsr", known_period, array
+                "weekly_hours_worked_before_behavioral_response",
+                known_period,
+                array,
             )
             weekly_hours.delete_arrays(known_period)
 
@@ -200,9 +216,9 @@ def __init__(self, *args, **kwargs):
                 "capital_gains",
             ]
         ] + [
-            "employment_income_before_lsr",
-            "self_employment_income_before_lsr",
-            "weekly_hours_worked_before_lsr",
+            "employment_income_before_behavioral_response",
+            "self_employment_income_before_behavioral_response",
+            "weekly_hours_worked_before_behavioral_response",
             "capital_gains_before_response",
         ]
 

policyengine_us/tests/policy/baseline/gov/states/co/tax/income/credits/sales_tax_refund/co_sales_tax_refund.yaml

@@ -32,7 +32,7 @@
     co_sales_tax_refund_eligible: true
     filing_status: SINGLE
   output:
-    co_sales_tax_refund: 800
+    co_sales_tax_refund: 661
 
 - name: Joint calculation
   period: 2022
@@ -51,20 +51,3 @@
     filing_status: SEPARATE
   output:
     co_sales_tax_refund: 234
-
-- name: Integration test
-  period: 2023
-  input:
-    people:
-      person1:
-        age: 40
-      person2:
-        age: 40
-    tax_units:
-      tax_unit:
-        members: [person1, person2]
-        co_modified_agi: 60_001
-        co_sales_tax_refund_eligible: true
-        filing_status: JOINT
-  output:
-    co_sales_tax_refund: 1_600

policyengine_us/tests/policy/baseline/gov/usda/snap/eligibility/student/is_snap_ineligible_student.yaml

@@ -4,7 +4,7 @@
     is_full_time_student: true
     age: 18
     is_disabled: false
-    weekly_hours_worked_before_lsr: false
+    weekly_hours_worked_before_behavioral_response: false
     is_parent: false
   output:
     is_snap_ineligible_student: true
@@ -15,7 +15,7 @@
     is_full_time_student: true
     age: 17
     is_disabled: false
-    weekly_hours_worked_before_lsr: false
+    weekly_hours_worked_before_behavioral_response: false
     is_parent: false
   output:
     is_snap_ineligible_student: false

policyengine_us/variables/gov/simulation/capital_gains_responses.py

@@ -96,6 +96,8 @@
         response_factor = np.exp(elasticity * tax_rate_change) - 1
         response = capital_gains * response_factor
 
+        print(response.sum())
+
         return response
 
 

policyengine_us/variables/gov/simulation/labor_supply_response/labor_supply_response.py

@@ -67,7 +67,7 @@
         return np.clip(relative_change, -wage_change_bound, wage_change_bound)
 
 
-class income_elasticity_lsr(Variable):
+class income_elasticity_behavioral_response(Variable):
     value_type = float
     entity = Person
     label = "income elasticity of labor supply response"
@@ -77,9 +77,11 @@
 
     def formula(person, period, parameters):
         lsr = parameters(period).gov.simulation.labor_supply_responses
-        employment_income = person("employment_income_before_lsr", period)
+        employment_income = person(
+            "employment_income_before_behavioral_response", period
+        )
         self_employment_income = person(
-            "self_employment_income_before_lsr", period
+            "self_employment_income_before_behavioral_response", period
         )
         earnings = employment_income + self_employment_income
         income_change = person("relative_income_change", period)
@@ -136,9 +138,9 @@
             1_726e3,
         ]
 
-        earnings = person("employment_income_before_lsr", period) + person(
-            "self_employment_income_before_lsr", period
-        )
+        earnings = person(
+            "employment_income_before_behavioral_response", period
+        ) + person("self_employment_income_before_behavioral_response", period)
         earnings_decile = (
             np.searchsorted(earnings_decile_markers, earnings) + 1
         )
@@ -178,7 +180,7 @@
         return elasticities
 
 
-class substitution_elasticity_lsr(Variable):
+class substitution_elasticity_behavioral_response(Variable):
     value_type = float
     entity = Person
     label = "substitution elasticity of labor supply response"
@@ -188,9 +190,11 @@
 
     def formula(person, period, parameters):
         lsr = parameters(period).gov.simulation.labor_supply_responses
-        employment_income = person("employment_income_before_lsr", period)
+        employment_income = person(
+            "employment_income_before_behavioral_response", period
+        )
         self_employment_income = person(
-            "self_employment_income_before_lsr", period
+            "self_employment_income_before_behavioral_response", period
         )
         earnings = employment_income + self_employment_income
         wage_change = person("relative_wage_change", period)
@@ -241,22 +245,24 @@
                 "self_employment_income_behavioral_response"
             )
             branch.set_input(
-                "employment_income_before_lsr",
+                "employment_income_before_behavioral_response",
                 period,
-                person("employment_income_before_lsr", period),
+                person("employment_income_before_behavioral_response", period),
             )
             branch.set_input(
-                "self_employment_income_before_lsr",
+                "self_employment_income_before_behavioral_response",
                 period,
-                person("self_employment_income_before_lsr", period),
+                person(
+                    "self_employment_income_before_behavioral_response", period
+                ),
             )
 
         response = add(
             person,
             period,
             [
-                "income_elasticity_lsr",
-                "substitution_elasticity_lsr",
+                "income_elasticity_behavioral_response",
+                "substitution_elasticity_behavioral_response",
             ],
         )
         simulation = person.simulation
@@ -280,9 +286,11 @@
 
     def formula(person, period, parameters):
         lsr = person("labor_supply_behavioral_response", period)
-        employment_income = person("employment_income_before_lsr", period)
+        employment_income = person(
+            "employment_income_before_behavioral_response", period
+        )
         self_employment_income = person(
-            "self_employment_income_before_lsr", period
+            "self_employment_income_before_behavioral_response", period
         )
         earnings = employment_income + self_employment_income
         emp_share = np.ones_like(earnings)

policyengine_us/variables/gov/states/il/tax/income/exemptions/il_personal_exemption.py

@@ -1,7 +1,4 @@
 from policyengine_us.model_api import *
-from policyengine_us.variables.gov.states.il.tax.income.exemptions.il_personal_exemption_eligibility_status import (
-    ILPersonalExemptionEligibilityStatus,
-)
 
 
 class il_personal_exemption(Variable):
@@ -17,16 +14,18 @@ def formula(tax_unit, period, parameters):
             "il_personal_exemption_eligibility_status", period
         )
 
+        eligibility_status = il_is_personal_exemption_eligible.possible_values
+
         personal_exemption_amount = parameters(
             period
         ).gov.states.il.tax.income.exemption.personal
 
         return personal_exemption_amount * select(
             [
                 il_is_personal_exemption_eligible
-                == ILPersonalExemptionEligibilityStatus.BOTH_ELIGIBLE,
+                == eligibility_status.BOTH_ELIGIBLE,
                 il_is_personal_exemption_eligible
-                == ILPersonalExemptionEligibilityStatus.PARTIALLY_ELIGIBLE,
+                == eligibility_status.PARTIALLY_ELIGIBLE,
             ],
             [2, 1],
             0,

policyengine_us/variables/gov/usda/snap/eligibility/student/is_snap_ineligible_student.py

@@ -17,7 +17,9 @@ def formula(person, period, parameters):
         p = parameters(period).gov.usda.snap.student
         age_eligible = p.age_threshold.calc(age)
         disabled = person("is_disabled", period)
-        hours_worked = person("weekly_hours_worked_before_lsr", period)
+        hours_worked = person(
+            "weekly_hours_worked_before_behavioral_response", period
+        )
         hours_eligible = hours_worked >= p.working_hours_threshold
         # The parental status applies to children under 6 (under 12
         # if no care available)

policyengine_us/variables/household/cliff.py

@@ -48,7 +48,6 @@ def formula(person, period, parameters):
             alt_person = alt_sim.person
             netinc_alt = alt_person.household("household_net_income", period)
             increase[mask] += netinc_alt[mask] - netinc_base[mask]
-            del sim.branches[f"cliff_for_adult_{adult_index}"]
         return where(increase < 0, -increase, 0)