Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 02b4dc53 authored by Denis Merigoux's avatar Denis Merigoux
Browse files

Fixed deltai bug

parent ae4dcdb6
No related branches found
No related tags found
No related merge requests found
...@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment