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
cc1951e5
Commit
cc1951e5
authored
6 years ago
by
Denis Merigoux
Browse files
Options
Downloads
Patches
Plain Diff
Fixed bug on memoizing m1
parent
ec9dee2f
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
+2
-3
2 additions, 3 deletions
questions.py
with
2 additions
and
3 deletions
questions.py
+
2
−
3
View file @
cc1951e5
...
@@ -192,7 +192,7 @@ class NouvelEnfant(MenageTransform):
...
@@ -192,7 +192,7 @@ class NouvelEnfant(MenageTransform):
return
[]
return
[]
def
transform_menage
(
self
,
m1
:
Menage
,
s
:
Solver
)
->
Menage
:
def
transform_menage
(
self
,
m1
:
Menage
,
s
:
Solver
)
->
Menage
:
self
.
s
1
=
m1
.
revenu_salaires
(
s
)
self
.
m
1
=
m1
if
self
.
nb_personnes_a_charge_init
is
not
None
:
if
self
.
nb_personnes_a_charge_init
is
not
None
:
s
.
add
(
m1
.
nb_personnes_a_charge
(
s
)
==
self
.
nb_personnes_a_charge_init
)
s
.
add
(
m1
.
nb_personnes_a_charge
(
s
)
==
self
.
nb_personnes_a_charge_init
)
m2
=
m1
.
nouvel_enfant
(
s
,
self
.
age_nouvel_enfant
,
self
.
changement_logement
)
m2
=
m1
.
nouvel_enfant
(
s
,
self
.
age_nouvel_enfant
,
self
.
changement_logement
)
...
@@ -213,8 +213,7 @@ class NouvelEnfant(MenageTransform):
...
@@ -213,8 +213,7 @@ class NouvelEnfant(MenageTransform):
class
ChangementDistributionRevenus
(
MenageTransform
):
class
ChangementDistributionRevenus
(
MenageTransform
):
def
__init__
(
self
)
->
None
:
def
__init__
(
self
)
->
None
:
self
.
s1
:
Optional
[
Montant
]
=
None
self
.
m1
:
Optional
[
Menage
]
=
None
self
.
deltai
:
Optional
[
Montant
]
=
None
self
.
m2
:
Optional
[
Menage
]
=
None
self
.
m2
:
Optional
[
Menage
]
=
None
def
table_params_lines
(
self
,
s
:
Solver
)
->
List
[
List
[
Any
]]:
def
table_params_lines
(
self
,
s
:
Solver
)
->
List
[
List
[
Any
]]:
...
...
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