Commit Graph

2066 Commits

Author SHA1 Message Date
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
Louis Gesbert
cd70e16ea3 Compiler: simplify EDefault term at construction
This allows to match on their structure further on.
2022-05-25 18:36:07 +02:00
Louis Gesbert
2d41f53300 Compiler: add a few helper comparison functions
Adds syntactic comparison for some expressions, etc., allowing in
particular to detect syntactically equal expressions. Positions are,
obviously, ignored.
2022-05-25 18:35:57 +02:00
Louis Gesbert
30297b27b8 Add dune rule to build tests
This allows a new magic command: `dune test -w`
2022-05-25 18:33:20 +02:00
Louis Gesbert
4c43b533b0
Merge pull request #213 from AltGr/plugin-support
Add backend plugin support
2022-05-25 18:31:30 +02:00
Louis Gesbert
8124d4dab5 Compiler: add some doc on plugin support 2022-05-25 17:27:49 +02:00
Denis Merigoux
5b4ab6d2b8
Merge pull request #267 from CatalaLang/refactor-web-api
Refactor the web API by serializing runtime values
2022-05-25 14:44:40 +01:00
Emile Rolley
92ebb4194b refactor(api_web/runtime): runtime_value derive yojson_of 2022-05-25 14:26:58 +02:00
Lilya Slimani
78e215ebef Merge branch 'allocations_logement' of https://github.com/CatalaLang/catala into allocations_logement 2022-05-24 17:11:32 +02:00
Lilya Slimani
65ba54b69d Suite de l'arrêté du 27 / 09 / 2019 2022-05-24 17:11:30 +02:00
Denis Merigoux
2a8e7f5f7e
New questions 2022-05-24 16:25:23 +02:00
Denis Merigoux
e207fac330
Put @Lilyaslm's tests under CI 2022-05-24 15:23:41 +02:00