Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Verifisc-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Catala
Verifisc-python
Commits
02b4dc53
Commit
02b4dc53
authored
6 years ago
by
Denis Merigoux
Browse files
Options
Downloads
Patches
Plain Diff
Fixed deltai bug
parent
ae4dcdb6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
questions.py
+12
-21
12 additions, 21 deletions
questions.py
with
12 additions
and
21 deletions
questions.py
+
12
−
21
View file @
02b4dc53
...
@@ -461,17 +461,14 @@ class DifferenceMarriageOuPacs(Question):
...
@@ -461,17 +461,14 @@ class DifferenceMarriageOuPacs(Question):
transform
=
MarriageOuPacs
()
transform
=
MarriageOuPacs
()
if
self
.
relative_true_absolue_false
:
if
self
.
relative_true_absolue_false
:
self
.
search_
=
DifferenceRelative
(
transform
,
max_true_min_false
)
self
.
search_
:
Union
[
DifferenceRelative
,
DifferenceAbsolue
]
=
DifferenceRelative
(
transform
,
max_true_min_false
)
else
:
else
:
self
.
search_
=
DifferenceAbsolue
(
transform
,
max_true_min_false
)
self
.
search_
:
Union
[
DifferenceRelative
,
DifferenceAbsolue
]
=
DifferenceAbsolue
(
transform
,
max_true_min_false
)
self
.
s1
:
Optional
[
Montant
]
=
None
self
.
deltai
:
Optional
[
Montant
]
=
None
def
result_found_lines
(
self
,
s
:
Solver
,
new_search_param_value
:
float
)
->
List
[
Tuple
[
str
,
Any
]]:
def
result_found_lines
(
self
,
s
:
Solver
,
new_search_param_value
:
float
)
->
List
[
Tuple
[
str
,
Any
]]:
if
self
.
deltai
is
None
:
if
self
.
search_
.
deltai
is
None
:
raise
TypeError
(
"
deltai is None !
"
)
raise
TypeError
(
"
deltai is None !
"
)
deltai_m
=
self
.
deltai
//
12
deltai_m
=
self
.
search_
.
deltai
//
12
return
[
return
[
(
"
Changement mensuel après marriage ou pacs
"
,
deltai_m
),
(
"
Changement mensuel après marriage ou pacs
"
,
deltai_m
),
((
"
Différence relative avec marriage ou pacs
"
,
"
{0:.1f}%
"
.
format
(
new_search_param_value
))
((
"
Différence relative avec marriage ou pacs
"
,
"
{0:.1f}%
"
.
format
(
new_search_param_value
))
...
@@ -526,17 +523,14 @@ class DifferenceNouvelEnfant(Question):
...
@@ -526,17 +523,14 @@ class DifferenceNouvelEnfant(Question):
age_nouvel_enfant
age_nouvel_enfant
)
)
if
self
.
relative_true_absolue_false
:
if
self
.
relative_true_absolue_false
:
self
.
search_
=
DifferenceRelative
(
transform
,
max_true_min_false
)
self
.
search_
:
Union
[
DifferenceRelative
,
DifferenceAbsolue
]
=
DifferenceRelative
(
transform
,
max_true_min_false
)
else
:
else
:
self
.
search_
=
DifferenceAbsolue
(
transform
,
max_true_min_false
)
self
.
search_
:
Union
[
DifferenceRelative
,
DifferenceAbsolue
]
=
DifferenceAbsolue
(
transform
,
max_true_min_false
)
self
.
s1
:
Optional
[
Montant
]
=
None
self
.
deltai
:
Optional
[
Montant
]
=
None
def
result_found_lines
(
self
,
s
:
Solver
,
new_search_param_value
:
float
)
->
List
[
Tuple
[
str
,
Any
]]:
def
result_found_lines
(
self
,
s
:
Solver
,
new_search_param_value
:
float
)
->
List
[
Tuple
[
str
,
Any
]]:
if
self
.
deltai
is
None
:
if
self
.
search_
.
deltai
is
None
:
raise
TypeError
(
"
deltai is None !
"
)
raise
TypeError
(
"
deltai is None !
"
)
deltai_m
=
self
.
deltai
//
12
deltai_m
=
self
.
search_
.
deltai
//
12
return
[
return
[
(
"
Changement mensuel après redistribution
"
,
deltai_m
),
(
"
Changement mensuel après redistribution
"
,
deltai_m
),
((
"
Différence relative avec nouvel enfant
"
,
"
{0:.1f}%
"
.
format
(
new_search_param_value
))
((
"
Différence relative avec nouvel enfant
"
,
"
{0:.1f}%
"
.
format
(
new_search_param_value
))
...
@@ -583,17 +577,14 @@ class DifferenceChangementDistributionRevenus(Question):
...
@@ -583,17 +577,14 @@ class DifferenceChangementDistributionRevenus(Question):
transform
=
ChangementDistributionRevenus
()
transform
=
ChangementDistributionRevenus
()
if
self
.
relative_true_absolue_false
:
if
self
.
relative_true_absolue_false
:
self
.
search_
=
DifferenceRelative
(
transform
,
max_true_min_false
)
self
.
search_
:
Union
[
DifferenceRelative
,
DifferenceAbsolue
]
=
DifferenceRelative
(
transform
,
max_true_min_false
)
else
:
else
:
self
.
search_
=
DifferenceAbsolue
(
transform
,
max_true_min_false
)
self
.
search_
:
Union
[
DifferenceRelative
,
DifferenceAbsolue
]
=
DifferenceAbsolue
(
transform
,
max_true_min_false
)
self
.
s1
:
Optional
[
Montant
]
=
None
self
.
deltai
:
Optional
[
Montant
]
=
None
def
result_found_lines
(
self
,
s
:
Solver
,
new_search_param_value
:
float
)
->
List
[
Tuple
[
str
,
Any
]]:
def
result_found_lines
(
self
,
s
:
Solver
,
new_search_param_value
:
float
)
->
List
[
Tuple
[
str
,
Any
]]:
if
self
.
deltai
is
None
:
if
self
.
search_
.
deltai
is
None
:
raise
TypeError
(
"
deltai is None !
"
)
raise
TypeError
(
"
deltai is None !
"
)
deltai_m
=
self
.
deltai
//
12
deltai_m
=
self
.
search_
.
deltai
//
12
return
[
return
[
(
"
Changement mensuel après redistribution
"
,
deltai_m
),
(
"
Changement mensuel après redistribution
"
,
deltai_m
),
((
"
Différence relative avec nouvelle distribution des revenus
"
,
"
{0:.1f}%
"
.
format
(
new_search_param_value
))
((
"
Différence relative avec nouvelle distribution des revenus
"
,
"
{0:.1f}%
"
.
format
(
new_search_param_value
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment