-
Notifications
You must be signed in to change notification settings - Fork 174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
NYS Clean Heat Program (con Edison) #4689
base: master
Are you sure you want to change the base?
Conversation
… fuyukitn/issue4648
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great start, some initial comment for folder structures and breakdown parameter values
policyengine_us/variables/gov/states/ny/nysdps/nys_clean_heat_conE_project_cost.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/nys_clean_heat_conE_project_cost.py
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_cap_amount.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_cap_unite.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_cap_unite.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_incentive.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_incentive.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_incentive.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/nys_clean_heat_conE_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/nys_clean_heat_conE_incentive.py
Outdated
Show resolved
Hide resolved
…conE_project_cost.py Co-authored-by: Pavel Makarchuk <[email protected]>
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount.yaml
Outdated
Show resolved
Hide resolved
…an_heat/amount.yaml Co-authored-by: Pavel Makarchuk <[email protected]>
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/residential_amount.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/rate.yaml
Outdated
Show resolved
Hide resolved
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4689 +/- ##
========================================
Coverage 98.97% 98.97%
========================================
Files 2468 2480 +12
Lines 35887 36078 +191
Branches 184 184
========================================
+ Hits 35518 35709 +191
Misses 339 339
Partials 30 30 ☔ View full report in Codecov by Sentry. |
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily_amount.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/cap.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/cap.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/cap.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Outdated
Show resolved
Hide resolved
Co-authored-by: Pavel Makarchuk <[email protected]>
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount/ashp.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount/ashp.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount/gshp.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily/cap.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily/rate.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/residential/rate.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/residential/rate.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily/rate.yaml
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py
Show resolved
Hide resolved
# calc capped incentive | ||
family_type_bool = family_type == family_type.possible_values.RESIDENTIAL | ||
min_incentive_residential = min_(uncapped_incentive, cap) | ||
min_incentive_multifamily = min(uncapped_incentive, cap, p.multifamily.cap) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since min_
function cannot be used for comparison involving more than two items, I reverted to min
function only here.
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_building_category.py
Outdated
Show resolved
Hide resolved
...ine_us/parameters/gov/states/ny/nysdps/clean_heat/clean_heat_con_edison/multifamily/cap.yaml
Outdated
Show resolved
Hide resolved
@@ -1,16 +1,16 @@ | |||
from policyengine_us.model_api import * | |||
|
|||
class BUILDCategory(Enum): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could this be a bool?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can be a boolean, but I made it an enumerated type to align with other conditions determining the incentive amount. Also, to avoid unnecessary misunderstanding, I'd like to use the exact wording from the policy. (below is a part of the diagram showing the classification)
Do you think it should be a boolean? If we make this a boolean, it would be good also to make DAC (whether it's DAC or not) a boolean.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry for delay - yes please make both bools. enums with two categories are ok if it could plausibly be expanded to more categories, but that doesn't seem the case here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Last adjustment:
can you create a rebates.yaml
list parameter file in the ny/tax/income
folder and include this credit for the relevant year.
Then add to the subtracts statement in the ny_income_tax.py
file
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_multifamily_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_multifamily_incentive.py
Outdated
Show resolved
Hide resolved
policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_residential_incentive.py
Outdated
Show resolved
Hide resolved
…ultifamily_incentive.py Co-authored-by: Pavel Makarchuk <[email protected]>
…esidential_incentive.py Co-authored-by: Pavel Makarchuk <[email protected]>
…ultifamily_incentive.py Co-authored-by: Pavel Makarchuk <[email protected]>
Fixes #4648