CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-11-08 07:51:43 +03:00
Code Issues Projects Releases Wiki Activity

Remove optimizations for big tests

Browse Source
This commit is contained in:
Denis Merigoux 2023-04-18 15:56:04 +02:00
parent f9a6644da3
commit f877544368
No known key found for this signature in database
GPG Key ID: EE99DCFA365C3EE3
13 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/catala_utils/cli.ml
View File

@ -490,7 +490,7 @@ let time_marker ppf () =
format_with_style
[ANSITerminal.Bold; ANSITerminal.black]
ppf
(Printf.sprintf "[TIME] %.0fms@\n" delta)
(Format.sprintf "[TIME] %.0fms@\n" delta)
(** Prints [\[DEBUG\]] in purple on the terminal standard output *)
let debug_marker ppf () =

5
compiler/shared_ast/expr.ml
View File

@ -779,9 +779,8 @@ let make_app ?(decl_ctx = None) e args pos =
match decl_ctx with
| None -> assert false
| Some decl_ctx ->
Errors.raise_error
"INTERNAL ERROR: wrong type: found %a while expecting either \
an Arrow or Any"
Errors.raise_internal_error
"wrong type: found %a while expecting either an Arrow or Any"
(Print.typ decl_ctx) fty.ty)))
(List.map Marked.get_mark (e :: args))
in

1
compiler/shared_ast/program.ml
View File

@ -74,6 +74,7 @@ let to_expr p main_scope =
res
let equal p p' =
(* TODO: include toplevel definitions in this program comparison. *)
let ss = all_scopes p.code_items in
let ss' = all_scopes p'.code_items in

2
examples/aides_logement/tests/tests_calcul_al_accession_propriete.catala_fr
View File

@ -44,7 +44,7 @@ $ catala Interpret -s Exemple1
[RESULT] montant = 96.48 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 96.48 €
```

4
examples/aides_logement/tests/tests_calcul_al_locatif.catala_fr
View File

@ -102,12 +102,12 @@ $ catala Interpret -s Exemple2 --disable_warnings
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 345.73 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 352.77 €
```

2
examples/aides_logement/tests/tests_calcul_al_logement_foyer.catala_fr
View File

@ -36,7 +36,7 @@ $ catala Interpret -s CasTest1 --disable_warnings
[RESULT] montant = 76.38 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s CasTest1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s CasTest1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 76.38 €
```

8
examples/aides_logement/tests/tests_calcul_apl_accession_propriete.catala_fr
View File

@ -168,22 +168,22 @@ $ catala Interpret -s Exemple4 --disable_warnings
[RESULT] montant = 118.59 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 181.91 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 67.34 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 181.91 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple4 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple4 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 118.59 €
```

18
examples/aides_logement/tests/tests_calcul_apl_locatif.catala_fr
View File

@ -332,47 +332,47 @@ $ catala Interpret -s Exemple9 --disable_warnings
[RESULT] montant = 210.06 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 0.00 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 352.77 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 321.61 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple4 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple4 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 0.00 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple5 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple5 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 311.56 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple6 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple6 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 0.00 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple7 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple7 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 153.77 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple8 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple8 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 11.06 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple9 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple9 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 210.06 €
```

10
examples/aides_logement/tests/tests_calcul_apl_logement_foyer.catala_fr
View File

@ -157,27 +157,27 @@ $ catala Interpret -s CasTest5 --disable_warnings
[RESULT] montant = 129.65 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s CasTest1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s CasTest1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 12.06 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s CasTest2 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s CasTest2 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 23.12 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s CasTest3 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s CasTest3 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 154.78 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s CasTest4 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s CasTest4 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 154.78 €
```
```catala-test-inline
$ catala Interpret_Lcalc -s CasTest5 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s CasTest5 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant = ESome 129.65 €
```

2
examples/aides_logement/tests/tests_calculette_globale.catala_fr
View File

@ -98,7 +98,7 @@ $ catala Interpret -s Exemple1
[RESULT] éligibilité = true
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] montant_versé = ESome 246.23 €
[RESULT] éligibilité = ESome true

2
examples/aides_logement/tests/tests_eligibilite_apl.catala_fr
View File

@ -260,7 +260,7 @@ $ catala Typecheck
[RESULT] Typechecking successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
[RESULT] Computation successful! Results:
[RESULT] éligible = ESome true
```

28
examples/allocations_familiales/tests/tests_allocations_familiales.catala_fr
View File

@ -423,58 +423,58 @@ $ catala Interpret -s Test13 --disable_warnings
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test1 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test2 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test2 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test3 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test3 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test4 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test4 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test5 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test5 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test6 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test6 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test7 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test7 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test8 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test8 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test9 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test9 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test10 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test10 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test11 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test11 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test12 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test12 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test13 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test13 --avoid_exceptions
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test13 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test13 --avoid_exceptions
[RESULT] Computation successful!
```

2
examples/allocations_familiales/tests/tests_ouverture_droits.catala_fr
View File

@ -65,6 +65,6 @@ $ catala Interpret -s Test1 --disable_warnings
[RESULT] Computation successful!
```
```catala-test-inline
$ catala Interpret_Lcalc -s Test1 --avoid_exceptions --optimize
$ catala Interpret_Lcalc -s Test1 --avoid_exceptions
[RESULT] Computation successful!
```