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

Python runtime: remove quoted type annotations

Browse Source
This commit is contained in:
Raphaël Monat 2024-05-09 19:02:06 +02:00
parent 43218e31ce
commit a076dc70b6
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
runtimes/python/src/catala/runtime.py
View File

@ -6,6 +6,7 @@
.. moduleauthor:: Denis Merigoux <denis.merigoux@inria.fr>
"""
from __future__ import annotations # 'ClsType' ~> ClsType annotations
# This file should be in sync with compiler/runtime.{ml, mli} !
@ -31,31 +32,31 @@ class Integer:
def __init__(self, value: Union[str, int]) -> None:
self.value = mpz(value)
def __add__(self, other: 'Integer') -> 'Integer':
def __add__(self, other: Integer) -> Integer:
return Integer(self.value + other.value)
def __sub__(self, other: 'Integer') -> 'Integer':
def __sub__(self, other: Integer) -> Integer:
return Integer(self.value - other.value)
def __mul__(self, other: 'Integer') -> 'Integer':
def __mul__(self, other: Integer) -> Integer:
return Integer(self.value * other.value)
def __truediv__(self, other: 'Integer') -> 'Decimal':
def __truediv__(self, other: Integer) -> Decimal:
return Decimal(self.value) / Decimal(other.value)
def __neg__(self: 'Integer') -> 'Integer':
def __neg__(self: Integer) -> Integer:
return Integer(- self.value)
def __lt__(self, other: 'Integer') -> bool:
def __lt__(self, other: Integer) -> bool:
return self.value < other.value
def __le__(self, other: 'Integer') -> bool:
def __le__(self, other: Integer) -> bool:
return self.value <= other.value
def __gt__(self, other: 'Integer') -> bool:
def __gt__(self, other: Integer) -> bool:
return self.value > other.value
def __ge__(self, other: 'Integer') -> bool:
def __ge__(self, other: Integer) -> bool:
return self.value >= other.value
def __ne__(self, other: object) -> bool:
@ -78,34 +79,34 @@ class Integer:
class Decimal:
def __init__(self, value: Union[str, int, float]) -> None:
def __init__(self, value: Union[str, int, float,Integer]) -> None:
self.value = mpq(value)
def __add__(self, other: 'Decimal') -> 'Decimal':
def __add__(self, other: Decimal) -> Decimal:
return Decimal(self.value + other.value)
def __sub__(self, other: 'Decimal') -> 'Decimal':
def __sub__(self, other: Decimal) -> Decimal:
return Decimal(self.value - other.value)
def __mul__(self, other: 'Decimal') -> 'Decimal':
def __mul__(self, other: Decimal) -> Decimal:
return Decimal(self.value * other.value)
def __truediv__(self, other: 'Decimal') -> 'Decimal':
def __truediv__(self, other: Decimal) -> Decimal:
return Decimal(self.value / other.value)
def __neg__(self: 'Decimal') -> 'Decimal':
def __neg__(self: Decimal) -> Decimal:
return Decimal(- self.value)
def __lt__(self, other: 'Decimal') -> bool:
def __lt__(self, other: Decimal) -> bool:
return self.value < other.value
def __le__(self, other: 'Decimal') -> bool:
def __le__(self, other: Decimal) -> bool:
return self.value <= other.value
def __gt__(self, other: 'Decimal') -> bool:
def __gt__(self, other: Decimal) -> bool:
return self.value > other.value
def __ge__(self, other: 'Decimal') -> bool:
def __ge__(self, other: Decimal) -> bool:
return self.value >= other.value
def __ne__(self, other: object) -> bool:
@ -131,13 +132,13 @@ class Money:
def __init__(self, value: Integer) -> None:
self.value = value
def __add__(self, other: 'Money') -> 'Money':
def __add__(self, other: Money) -> Money:
return Money(self.value + other.value)
def __sub__(self, other: 'Money') -> 'Money':
def __sub__(self, other: Money) -> Money:
return Money(self.value - other.value)
def __mul__(self, other: Decimal) -> 'Money':
def __mul__(self, other: Decimal) -> Money:
cents = self.value.value
coeff = other.value
# TODO: change, does not work with negative values. Must divide the
@ -150,7 +151,7 @@ class Money:
else:
return Money(Integer(res))
def __truediv__(self, other: 'Money') -> Decimal:
def __truediv__(self, other: Money) -> Decimal:
if isinstance(other, Money):
return self.value / other.value
elif isinstance(other, Decimal):
@ -158,19 +159,19 @@ class Money:
else:
raise Exception("Dividing money and invalid obj")
def __neg__(self: 'Money') -> 'Money':
def __neg__(self: Money) -> Money:
return Money(- self.value)
def __lt__(self, other: 'Money') -> bool:
def __lt__(self, other: Money) -> bool:
return self.value < other.value
def __le__(self, other: 'Money') -> bool:
def __le__(self, other: Money) -> bool:
return self.value <= other.value
def __gt__(self, other: 'Money') -> bool:
def __gt__(self, other: Money) -> bool:
return self.value > other.value
def __ge__(self, other: 'Money') -> bool:
def __ge__(self, other: Money) -> bool:
return self.value >= other.value
def __ne__(self, other: object) -> bool:
@ -196,7 +197,7 @@ class Date:
def __init__(self, value: datetime.date) -> None:
self.value = value
def __add__(self, other: 'Duration') -> 'Date':
def __add__(self, other: Duration) -> Date:
return Date(self.value + other.value)
def __sub__(self, other: object) -> object:
@ -207,16 +208,16 @@ class Date:
else:
raise Exception("Substracting date and invalid obj")
def __lt__(self, other: 'Date') -> bool:
def __lt__(self, other: Date) -> bool:
return self.value < other.value
def __le__(self, other: 'Date') -> bool:
def __le__(self, other: Date) -> bool:
return self.value <= other.value
def __gt__(self, other: 'Date') -> bool:
def __gt__(self, other: Date) -> bool:
return self.value > other.value
def __ge__(self, other: 'Date') -> bool:
def __ge__(self, other: Date) -> bool:
return self.value >= other.value
def __ne__(self, other: object) -> bool:
@ -242,16 +243,16 @@ class Duration:
def __init__(self, value: dateutil.relativedelta.relativedelta) -> None:
self.value = value
def __add__(self, other: 'Duration') -> 'Duration':
def __add__(self, other: Duration) -> Duration:
return Duration(self.value + other.value)
def __sub__(self, other: 'Duration') -> 'Duration':
def __sub__(self, other: Duration) -> Duration:
return Duration(self.value - other.value)
def __neg__(self: 'Duration') -> 'Duration':
def __neg__(self: Duration) -> Duration:
return Duration(- self.value)
def __truediv__(self, other: 'Duration') -> Decimal:
def __truediv__(self, other: Duration) -> Decimal:
x = self.value.normalized()
y = other.value.normalized()
if (x.years != 0 or y.years != 0 or x.months != 0 or y.months != 0):
@ -259,13 +260,13 @@ class Duration:
else:
return Decimal(x.days / y.days)
def __mul__(self: 'Duration', rhs: Integer) -> 'Duration':
def __mul__(self: Duration, rhs: Integer) -> Duration:
return Duration(
dateutil.relativedelta.relativedelta(years=self.value.years * rhs.value,
months=self.value.months * rhs.value,
days=self.value.days * rhs.value))
def __lt__(self, other: 'Duration') -> bool:
def __lt__(self, other: Duration) -> bool:
x = self.value.normalized()
y = other.value.normalized()
if (x.years != 0 or y.years != 0 or x.months != 0 or y.months != 0):
@ -273,7 +274,7 @@ class Duration:
else:
return x.days < y.days
def __le__(self, other: 'Duration') -> bool:
def __le__(self, other: Duration) -> bool:
x = self.value.normalized()
y = other.value.normalized()
if (x.years != 0 or y.years != 0 or x.months != 0 or y.months != 0):
@ -281,7 +282,7 @@ class Duration:
else:
return x.days <= y.days
def __gt__(self, other: 'Duration') -> bool:
def __gt__(self, other: Duration) -> bool:
x = self.value.normalized()
y = other.value.normalized()
if (x.years != 0 or y.years != 0 or x.months != 0 or y.months != 0):
@ -289,7 +290,7 @@ class Duration:
else:
return x.days > y.days
def __ge__(self, other: 'Duration') -> bool:
def __ge__(self, other: Duration) -> bool:
x = self.value.normalized()
y = other.value.normalized()
if (x.years != 0 or y.years != 0 or x.months != 0 or y.months != 0):