Denis Merigoux
b77dc8c9d6
Better translation of D823-20
2022-06-16 12:04:55 +02:00
Denis Merigoux
316f238d66
Restore test
2022-06-07 19:25:45 +02:00
Denis Merigoux
60089bb2b2
Added big allocations logement branching calculator that distributes by sector like the APL one
2022-06-06 18:26:22 +02:00
Denis Merigoux
ff7e94d89a
Nitpicks
2022-06-06 18:11:06 +02:00
Denis Merigoux
fba22ab38d
Added justification for CRDS
2022-06-06 18:03:58 +02:00
Denis Merigoux
d80d4bc129
Removed part of too long name
2022-06-06 17:43:45 +02:00
Denis Merigoux
098621ac19
Remove part of law not necessary for computation
2022-06-06 17:41:03 +02:00
Denis Merigoux
8ddb157bc3
Distinguo entre aides personnelle et aide personnalisée
2022-06-06 17:39:51 +02:00
Denis Merigoux
4ba73a80c9
Rename ParentÀCharge -> AutrePersonneÀCharge
2022-06-06 16:44:15 +02:00
Denis Merigoux
d058936e2f
Fix and tests
2022-06-03 16:49:09 +02:00
Denis Merigoux
7b72a4ca08
A few tests for logement foyer
2022-06-03 16:43:02 +02:00
Lilya Slimani
158feef445
Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement
2022-06-03 15:58:20 +02:00
Denis Merigoux
a29a8d5df8
Finished last arrêtés with @Lilyaslm!
2022-06-03 15:57:21 +02:00
Lilya Slimani
b4626b8f52
Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement
2022-06-03 15:56:28 +02:00
Lilya Slimani
8ceb6f0608
Test Logement Foyer
2022-06-03 15:55:17 +02:00
Denis Merigoux
86bdd7dd54
Implemented horrible horrible article 33 with @Lilyslm
2022-06-03 15:19:01 +02:00
Denis Merigoux
c9671611b9
Add TODOs
2022-06-03 14:02:11 +02:00
Denis Merigoux
ab0f4eb28c
Merge branch 'master' into allocations_logement
2022-06-01 17:28:54 +02:00
Denis Merigoux
05a1405c70
Another precision
2022-06-01 17:27:08 +02:00
Denis Merigoux
77baeb7680
DGALN not DGLAN
2022-06-01 17:02:12 +02:00
Denis Merigoux
c93cb10745
Added exceptional values not found in law but confirmed by administration
2022-06-01 16:47:37 +02:00
Denis Merigoux
35dab61e7a
Merge pull request #276 from CatalaLang/protz_muldur
...
add support for duration multiplication
2022-06-01 14:50:14 +01:00
Denis Merigoux
b566253025
Add mul and div in Python backend
2022-06-01 15:35:55 +02:00
Denis Merigoux
65225d467c
Added new operator to syntax cheat sheet
2022-06-01 15:23:56 +02:00
Denis Merigoux
8782168632
Added test for month multiplication
2022-06-01 15:20:32 +02:00
Denis Merigoux
6e4e646dd8
More robust implementation of duration multiplication
2022-06-01 15:15:22 +02:00
Denis Merigoux
ae8d59d133
Intégration réponses DGLAN/DHUP/FE4 du 25/05/2022
2022-06-01 12:08:44 +02:00
Denis Merigoux
ff24f7d324
Added missing rent values for foyer housing
2022-06-01 11:22:05 +02:00
Denis Merigoux
878de024b7
Better error message
2022-06-01 11:13:14 +02:00
Jonathan Protzenko
0e68c07567
Reset parser messages
2022-06-01 10:26:14 +02:00
kescher
db9eec3b9f
add support for duration multiplication
...
Signed-off-by: Jonathan Protzenko <protz@microsoft.com>
2022-05-31 11:17:38 -07:00
Denis Merigoux
853d92ad34
Fix test encoding
2022-05-31 16:24:37 +02:00
Denis Merigoux
89db6d9b69
Fix logging regression involuntarily introduced by #268
2022-05-31 16:09:32 +02:00
Denis Merigoux
c9f5555a6f
Merge pull request #271 from CatalaLang/convert-nix-to-flake
...
Fix Nix expressions and convert them to flakes (Continuation)
2022-05-31 13:48:20 +01:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
d63eb07cc4
adding the commit of the flake update
2022-05-31 14:13:27 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
4752a7f579
more documentation
2022-05-31 14:08:48 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
17592d060e
documentation
2022-05-31 14:02:39 +02:00
Denis Merigoux
d23fcf7194
Merge pull request #268 from AltGr/combined-exns
...
Compiler: support cumulative exceptions
2022-05-31 10:12:33 +01:00
Denis Merigoux
7c779a07a8
More SMIC Data + table formatting
2022-05-30 17:36:59 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
49a3267eec
automated updating of flakes every weeks
2022-05-30 16:56:40 +02:00
lIlIlIlIIIIlIIIllIIlIllIIllIII
26ac1dc1bd
modification on github actions to make it compatible with flakes
2022-05-30 15:51:26 +02:00
Denis Merigoux
6d0b3d2a3f
Merge pull request #270 from W95Psp/convert-nix-to-flake
...
Fix Nix expressions and convert them to flakes
2022-05-30 14:27:29 +01:00
Lucas Franceschino
33773f42b4
Fix Nix and convert to flakes
2022-05-30 15:18:18 +02:00
Denis Merigoux
ff1b4eb5fd
Merge branch 'allocations_logement' of github.com:CatalaLang/catala into allocations_logement
2022-05-30 14:55:52 +02:00
Louis Gesbert
81fe7eba47
Tutorial: Add section on cumulative exceptions
2022-05-30 14:45:52 +02:00
Louis Gesbert
9ef8625df7
Compiler: support cumulative exceptions
...
Closes #208 (implementing Solution 1, without adding an explicit syntax)
Two exceptions or more, e.g. `(j1 |- c1)` and `(j2 |- c2)` such that `c1
= c2`, are collapsed by this transformation into `((j1 |- c1) | j2 |-
c2)`, introducing an arbitrary precedence that avoids the conflict.
The transormation is not applied if any exceptions apply to the subterms
themselves: while these exceptions could be merged, that would turn more
conflicts into arbitrary outcomes than wanted.
2022-05-30 14:22:34 +02:00
Denis Merigoux
fd7d9a6818
Add missing options
2022-05-26 19:10:53 +02:00
Denis Merigoux
ec225994af
Add "print_only_law" option
2022-05-26 19:05:06 +02:00
Denis Merigoux
7abaf825c5
Merge branch 'master' into allocations_logement
2022-05-26 18:48:31 +02:00
Denis Merigoux
225bd4aaf7
Fix missing parenthesis
2022-05-26 18:48:05 +02:00
