Skip to content

Remove careProvdedFlag and correct bugs in care hours transformations#462

Closed
dav-sonn wants to merge 1 commit intodevelopfrom
care_fix
Closed

Remove careProvdedFlag and correct bugs in care hours transformations#462
dav-sonn wants to merge 1 commit intodevelopfrom
care_fix

Conversation

@dav-sonn
Copy link
Copy Markdown
Collaborator

@dav-sonn dav-sonn commented May 1, 2026

Remove the SocialCareProvision enum and associated discrete provision state/flags across the model. Replace reliance on a care-provision label with checks of careHrsProvidedWeek (and a simple careProvided int where needed), remove the SocialCareAlignment class and the SocialCareMarketClearing process, and stop loading the CareProvisionAdjustment timeseries. Update expectations, decision grid, manager/grids export, and states code to omit the provision axis; adjust DataParser migration SQL to drop the old careProvidedFlag column handling. Also switch several stochastic/regression transforms from exp(...) to sinh(...), and update innovation draw indices and related uses to match the new flows. This simplifies social-care handling to use hours-based logic and removes the root-search based alignment step.

Remove the SocialCareProvision enum and associated discrete provision state/flags across the model. Replace reliance on a care-provision label with checks of careHrsProvidedWeek (and a simple careProvided int where needed), remove the SocialCareAlignment class and the SocialCareMarketClearing process, and stop loading the CareProvisionAdjustment timeseries. Update expectations, decision grid, manager/grids export, and states code to omit the provision axis; adjust DataParser migration SQL to drop the old careProvidedFlag column handling. Also switch several stochastic/regression transforms from exp(...) to sinh(...), and update innovation draw indices and related uses to match the new flows. This simplifies social-care handling to use hours-based logic and removes the root-search based alignment step.
@dav-sonn dav-sonn requested a review from justin-ven May 1, 2026 15:44
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These changes all look spurious

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This adjustment looks spurious

evaluateSocialCareReceipt();
}
case SocialCareProvision -> {
evaluateSocialCareProvision();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This replace looks spurious

careFormalX = 0.0;
}

protected void evaluateSocialCareProvision() {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This deletion looks spurious

@@ -5148,10 +5092,6 @@ public Long getPartnerID() {
private void nullPartnerVariables() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This method no longer needed

@justin-ven justin-ven closed this May 5, 2026
@dav-sonn dav-sonn deleted the care_fix branch May 5, 2026 17:21
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.

2 participants