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.

Sign up for GitHub

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

Jump to bottom

Fixing French housing benefits #287

Merged
merged 27 commits into from
Jul 22, 2022
Merged

Fixing French housing benefits #287

merged 27 commits into from
Jul 22, 2022

Conversation

denismerigoux
Copy link
Contributor

@denismerigoux denismerigoux commented Jul 11, 2022 •
edited
Loading

Follow-up of #266 and #165.

Time spent

Pair programming sessions

  • Before 2022-07-11: 50h (50 h for each person of the pair programming duo)

Refactoring sessions

  • Before 2022-07-11: 24 h
  • 2022-07-14: 3 h

Legal research sessions

  • Before 2022-07-11: 21,5 h

Testing and debugging

  • Before 2022-07-11: 13,5 h
  • 2022-07-11: 3 h with Denis
  • 2022-07-13: 2 h with Denis
  • 2022-07-14: 1 h with Denis
  • 2022-07-16: 2 h with Denis
  • 2022-07-19: 2 h with Denis
  • 2022-07-21: 2 h with Denis

Changelog

  • Checked AL/APL locatif with example from government
  • Discovered and fix bug in participation minimale
  • Discovered and fix bug in mensualité minimale
  • Extended computation of AL/APL locatif in the past (Oct. 1st, 2020)
  • Rename D832-15 travaux alternatives and shuffle "pas de travaux" to correct alternative
  • Factorize sub-computations reused in different scopes
  • Add first_day_of_month/last_day_of_month
  • Add negative duration literals by extending any literal to be optionnally negative (- prefix).

What's missing

catala/examples/aides_logement/arrete_2019-09-27.catala_fr

Lines 181 to 194 in 71b03d8

étiquette chambre exception base
définition plafond_loyer_d823_16_2 égal à
selon zone sous forme
-- Zone1: 268,26€
-- Zone2: 233,80€
-- Zone3: 219,13€
exception chambre définition plafond_loyer_d823_16_2 sous condition
âgées_ou_handicap_adultes_hébergées_onéreux_particuliers
conséquence égal à
selon zone sous forme
-- Zone1: 223,55€
-- Zone2: 194,84€
-- Zone3: 182,61€

catala/examples/aides_logement/arrete_2019-09-27_archives.catala_fr

Lines 118 to 131 in 71b03d8

étiquette chambre exception base
définition plafond_loyer_d823_16_2 égal à
selon zone sous forme
-- Zone1: 267,14€
-- Zone2: 232,82€
-- Zone3: 218,21€
exception chambre définition plafond_loyer_d823_16_2 sous condition
âgées_ou_handicap_adultes_hébergées_onéreux_particuliers
conséquence égal à
selon zone sous forme
-- Zone1: 222,62€
-- Zone2: 194,02€
-- Zone3: 181,85€

@denismerigoux denismerigoux added ❌ bug Something isn't working ⚖️ program This issue concerns some Catala program labels Jul 11, 2022
@denismerigoux denismerigoux mentioned this pull request Jul 12, 2022
Merged
@denismerigoux
Merge branch 'master' into aides_logement
83067fe
@denismerigoux
Fix test format
e0ad15b
@denismerigoux
Don't print functions on CLI tracing mode; they're too big
fffa318
@denismerigoux
More testing
80843cc
@denismerigoux
In the process of debugging AccessionPropriété
0d21884
@denismerigoux
More testing and code fixing
29f9dfe
@denismerigoux
Help OCaml's type inference
05115c7 
Needed because of constructor name confusion
@denismerigoux
Factorize equivalence minimal loyer and nombre parts into their own s…
edbb862 
…copes
@denismerigoux
Fix subtle bug. Might be worth it to ask to DGALN! [skip ci]
94a1d9b
@denismerigoux
Invert hierarchy for old articles [skip ci]
5e0b20c
@denismerigoux
Include some tests given by DGALN/DHUP/FE4
bd6218f
@denismerigoux
Formatting [skip ci]
f5c3910
@denismerigoux
Fix tests with new info from DGALN
c134dc4
@denismerigoux
Added primitives money_to_decimal and decimal_to_money [skip ci]
be373f0
@denismerigoux
In the process of switching some money types to decimal [skip ci]
793efb4
@denismerigoux
Don't round as much according to DGALN
47f3632
@denismerigoux
Do not round for mensualite_minimale [skip ci]
59bdd2a
@denismerigoux
Merge remote-tracking branch 'origin/master' into aides_logement
58cb48f
@denismerigoux denismerigoux marked this pull request as ready for review July 20, 2022 09:20
@denismerigoux
Copy link
Contributor Author

Let's first merge #289, confirm that it passes CI and then go!

@denismerigoux denismerigoux merged commit e2b9b80 into master Jul 22, 2022
@denismerigoux denismerigoux mentioned this pull request Aug 11, 2022
Merged
denismerigoux added a commit that referenced this pull request Aug 19, 2022
@denismerigoux
Improving French housing benefits (#314)
9008a7f 
Follow-up of #287, #266 and #165.
Time spent
Pair programming sessions

Before 2022-07-11: 50h (50 h for each person of the pair programming duo)

Refactoring sessions

Before 2022-07-11: 24 h
2022-07-14: 3 h

Legal research sessions

Before 2022-07-11: 21,5 h

Testing and debugging

Before 2022-07-11: 13,5 h
2022-07-11: 3 h with Denis
2022-07-13: 2 h with Denis
2022-07-14: 1 h with Denis
2022-07-16: 2 h with Denis
2022-07-19: 2 h with Denis
2022-07-21: 2 h with Denis
2022-08-11: 6 h with Denis
2022-08-15: 4 h with Denis
2022-08-16: 2 h with Denis

UI and form

2022-08-09: 8 h with Denis
2022-08-10: 8 h with Denis
2022-08-15: 2 h with Denis
2022-08-16: 2 h with Denis
2022-08-17: 6 h with Denis
2022-08-18: 4 h with Denis
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
❌ bug Something isn't working ⚖️ program This issue concerns some Catala program
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@denismerigoux