NYS Clean Heat Program (con Edison) #4689

fuyukitn · 2024-06-25T21:01:36Z

Fixes #4648

… fuyukitn/issue4648

PavelMakarchuk

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

policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_cap_amount.yaml

policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_cap_unite.yaml

policyengine_us/parameters/gov/states/ny/nysdps/nys_clean_heat/conE_incentive.yaml

policyengine_us/variables/gov/states/ny/nysdps/nys_clean_heat_conE_incentive.py

…conE_project_cost.py Co-authored-by: Pavel Makarchuk <[email protected]>

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount.yaml

…an_heat/amount.yaml Co-authored-by: Pavel Makarchuk <[email protected]>

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/residential_amount.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/rate.yaml

codecov · 2024-06-29T00:04:00Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.97%. Comparing base (3cd3771) to head (d979325).
Report is 37 commits behind head on master.

❗ Current head d979325 differs from pull request most recent head edef16e

Please upload reports for the commit edef16e to get more accurate results.

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.
📢 Have feedback on the report? Share it here.

changelog_entry.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily_amount.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/cap.yaml

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py

Co-authored-by: Pavel Makarchuk <[email protected]>

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount/ashp.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/amount/gshp.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily/cap.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily/rate.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/residential/rate.yaml

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/multifamily/rate.yaml

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py

fuyukitn · 2024-07-01T23:22:39Z

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py

+        # 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)


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

...ine_us/parameters/gov/states/ny/nysdps/clean_heat/clean_heat_con_edison/multifamily/cap.yaml

MaxGhenis · 2024-07-03T17:24:29Z

policyengine_us/variables/gov/states/ny/nysdps/categories/ny_clean_heat_building_category.py

@@ -1,16 +1,16 @@
 from policyengine_us.model_api import *

 class BUILDCategory(Enum):


could this be a bool?

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.

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

PavelMakarchuk

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

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_residential_incentive.py

…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]>

fuyukitn and others added 23 commits June 18, 2024 15:42

Added geothermal files

ff2d2f0

update changelog for geothermal

f82c495

Create unit test for ny_geothermal_energy_system_credit

afd4440

Populate changelog_entry.yaml

8688b0b

Corrected path to params

f1e4ac6

Made changes per Pavel's comments on PR draft

771038b

Corrected input in tests

9094813

all files

81be3d4

Delete kj_alison_issues/files/upstate_coned.yaml

376dc3a

Delete kj_alison_issues/files/limit.yaml

fe57cf0

Delete kj_alison_issues/files/old_pv_system_size.yaml

a87415a

Delete kj_alison_issues/files/pv_system_size.yaml

9041d3c

Delete kj_alison_issues/files/percentage.yaml

c4a9358

Delete kj_alison_issues/files/new_pv_system_size.yaml

513d974

Delete kj_alison_issues/files/long_island.yaml

1c9c025

Delete kj_alison_issues/files/max_system_size.py

7e76ffb

Delete kj_alison_issues/files/range.yaml

c8e8f58

Delete kj_alison_issues/files/max_cost.yaml

3c96732

Merged.

dad1878

Implemented residential part

e292ab6

Deleted geothermal files

8f50b0a

Merge branch 'master' of github.com:PolicyEngine/policyengine-us into…

e145c0b

… fuyukitn/issue4648

Updated multifamily part and created test.

bbc838a

PavelMakarchuk requested changes Jun 26, 2024

View reviewed changes

fuyukitn and others added 2 commits June 26, 2024 10:55

Update policyengine_us/variables/gov/states/ny/nysdps/nys_clean_heat_…

ce72b6c

…conE_project_cost.py Co-authored-by: Pavel Makarchuk <[email protected]>

Modified according to Pavels advice

6527a27

PavelMakarchuk requested changes Jun 27, 2024

View reviewed changes

fuyukitn and others added 3 commits June 27, 2024 10:42

Update policyengine_us/parameters/gov/states/ny/nysdps/con_edison_cle…

1306326

…an_heat/amount.yaml Co-authored-by: Pavel Makarchuk <[email protected]>

Minor update

77bd348

Added variables(MMBtu, dwelling unit)

6732283

fuyukitn commented Jun 27, 2024

View reviewed changes

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py Outdated Show resolved Hide resolved

fuyukitn commented Jun 27, 2024

View reviewed changes

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py Outdated Show resolved Hide resolved

PavelMakarchuk reviewed Jun 28, 2024

View reviewed changes

policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_incentive.py Outdated Show resolved Hide resolved

PavelMakarchuk reviewed Jun 28, 2024

View reviewed changes

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/residential_amount.yaml Outdated Show resolved Hide resolved

PavelMakarchuk reviewed Jun 28, 2024

View reviewed changes

policyengine_us/parameters/gov/states/ny/nysdps/con_edison_clean_heat/rate.yaml Outdated Show resolved Hide resolved

fuyukitn added 2 commits June 28, 2024 17:48

Updated function and Passed tests.

69757aa

Minor update (modified pdf link)

d979325

fuyukitn requested a review from PavelMakarchuk June 28, 2024 22:54

PavelMakarchuk requested changes Jul 1, 2024

View reviewed changes

PavelMakarchuk mentioned this pull request Jul 1, 2024

NYS Clean Heat Program for CH&E, NGRID, NYSEG, O&R, RG&E customers #4693

Open

fuyukitn and others added 2 commits July 1, 2024 11:07

Apply suggestions from code review

6a0a600

Co-authored-by: Pavel Makarchuk <[email protected]>

Minor update

67c9057

PavelMakarchuk requested changes Jul 1, 2024

View reviewed changes

Updated descriptions etc and modified for integration.

edef16e

fuyukitn commented Jul 1, 2024

View reviewed changes

PavelMakarchuk requested changes Jul 2, 2024

View reviewed changes

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

fuyukitn added 2 commits July 2, 2024 17:04

Created subfolder and splitted incentive function.

fa396ab

Reformated for the test

cb12d5e

MaxGhenis reviewed Jul 3, 2024

View reviewed changes

fuyukitn added 2 commits July 5, 2024 11:30

Reformated filse(black)

ec02a53

Executed make format

3ad3c1c

PavelMakarchuk requested changes Jul 7, 2024

View reviewed changes

fuyukitn and others added 5 commits July 8, 2024 11:43

Update policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_m…

cb4e280

…ultifamily_incentive.py Co-authored-by: Pavel Makarchuk <[email protected]>

Update policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_r…

c2de66d

…esidential_incentive.py Co-authored-by: Pavel Makarchuk <[email protected]>

Update policyengine_us/variables/gov/states/ny/nysdps/ny_clean_heat_m…

14571d9

…ultifamily_incentive.py Co-authored-by: Pavel Makarchuk <[email protected]>

Add rebate.py etc

47ec08d

Modified fine names(rebates)

4e6d98e

PavelMakarchuk approved these changes Aug 21, 2024

View reviewed changes

PavelMakarchuk requested a review from MaxGhenis August 21, 2024 16:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NYS Clean Heat Program (con Edison) #4689

NYS Clean Heat Program (con Edison) #4689

fuyukitn commented Jun 25, 2024

PavelMakarchuk left a comment

codecov bot commented Jun 29, 2024 •

edited

Loading

fuyukitn Jul 1, 2024

MaxGhenis Jul 3, 2024

fuyukitn Jul 5, 2024 •

edited

Loading

MaxGhenis Aug 25, 2024

PavelMakarchuk left a comment

		@@ -1,16 +1,16 @@
		from policyengine_us.model_api import *

		class BUILDCategory(Enum):

NYS Clean Heat Program (con Edison) #4689

Are you sure you want to change the base?

NYS Clean Heat Program (con Edison) #4689

Conversation

fuyukitn commented Jun 25, 2024

PavelMakarchuk left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 29, 2024 • edited Loading

Codecov Report

fuyukitn Jul 1, 2024

Choose a reason for hiding this comment

MaxGhenis Jul 3, 2024

Choose a reason for hiding this comment

fuyukitn Jul 5, 2024 • edited Loading

Choose a reason for hiding this comment

MaxGhenis Aug 25, 2024

Choose a reason for hiding this comment

PavelMakarchuk left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 29, 2024 •

edited

Loading

fuyukitn Jul 5, 2024 •

edited

Loading