Skip to content
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

add class: SimulationMacroCache #224

Merged
merged 17 commits into from
Sep 2, 2024
Merged

Conversation

SylviaDu99
Copy link
Collaborator

WIP: Another version for feat: SimulationMacroCache

targeting to fix: #197

Copy link

codecov bot commented Jul 15, 2024

Codecov Report

Attention: Patch coverage is 54.79452% with 33 lines in your changes missing coverage. Please review.

Project coverage is 82.13%. Comparing base (64937e2) to head (e5449e3).
Report is 10 commits behind head on master.

Files Patch % Lines
policyengine_core/simulations/sim_macro_cache.py 58.53% 17 Missing ⚠️
policyengine_core/simulations/simulation.py 27.27% 14 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #224      +/-   ##
==========================================
- Coverage   82.56%   82.13%   -0.43%     
==========================================
  Files         187      190       +3     
  Lines        9328     9574     +246     
  Branches     1183     1206      +23     
==========================================
+ Hits         7702     7864     +162     
- Misses       1348     1427      +79     
- Partials      278      283       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@SylviaDu99 SylviaDu99 marked this pull request as ready for review August 9, 2024 23:48
Copy link
Contributor

@anth-volk anth-volk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contributions to this @SylviaDu99. I've left a couple minor change requests, and it would also be appreciated if you could update your PR description. I'd also like to get Nikhil's review on this, so I've requested his review, as well.

policyengine_core/simulations/sim_macro_cache.py Outdated Show resolved Hide resolved
policyengine_core/simulations/simulation.py Outdated Show resolved Hide resolved
Copy link
Contributor

@nikhilwoodruff nikhilwoodruff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this @SylviaDu99! Just a few comments.

from policyengine_core.taxbenefitsystems import TaxBenefitSystem


class Singleton(type):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry- could you explain why we need this?

policyengine_core/simulations/simulation.py Show resolved Hide resolved
tests/core/test_simulations.py Show resolved Hide resolved
policyengine_core/simulations/simulation.py Outdated Show resolved Hide resolved
policyengine_core/simulations/simulation.py Outdated Show resolved Hide resolved
policyengine_core/simulations/simulation.py Outdated Show resolved Hide resolved
policyengine_core/simulations/simulation.py Outdated Show resolved Hide resolved
@anth-volk anth-volk self-requested a review August 22, 2024 04:29
Copy link
Contributor

@anth-volk anth-volk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SylviaDu99 Thanks again for this, apologies for the delay in reviewing. I requested just one minor change, then I think this should be good to merge.

"""
if not self.is_over_dataset:
return None
if hasattr(self, "dataset"):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if hasattr(self, "dataset"):
if hasattr(self, "dataset") and self.dataset.data_format == Dataset.FLAT_FILE:

I think this is better form instead of nesting if's

@anth-volk anth-volk self-requested a review September 2, 2024 12:54
Copy link
Contributor

@anth-volk anth-volk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your hard work on this @SylviaDu99!

@anth-volk anth-volk merged commit 8648c96 into PolicyEngine:master Sep 2, 2024
4 checks passed
@SylviaDu99 SylviaDu99 deleted the cache197_1 branch September 3, 2024 04:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Automatically clear macro caching on new country package versions
3 participants