always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CP-SAT] fix python typing in objective expression

Browse Source
This commit is contained in:
Laurent Perron
2023-12-06 14:12:11 +01:00
parent ebfa2c1e77
commit 30976f1018
1 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ortools/sat/python/cp_model.py
View File

@@ -398,25 +398,69 @@ class LinearExpr:
"please use CpModel.add_abs_equality"
)
@overload
def __add__(self, arg: LinearExprT) -> LinearExprT:
...
@overload
def __add__(self, arg: ObjLinearExprT) -> ObjLinearExprT:
...
def __add__(self, arg):
if cmh.is_zero(arg):
return self
return _Sum(self, arg)
@overload
def __radd__(self, arg: LinearExprT) -> LinearExprT:
...
@overload
def __radd__(self, arg: ObjLinearExprT) -> ObjLinearExprT:
...
def __radd__(self, arg):
if cmh.is_zero(arg):
return self
return _Sum(self, arg)
@overload
def __sub__(self, arg: LinearExprT) -> LinearExprT:
...
@overload
def __sub__(self, arg: ObjLinearExprT) -> ObjLinearExprT:
...
def __sub__(self, arg):
if cmh.is_zero(arg):
return self
return _Sum(self, -arg)
if isinstance(arg, NumberT):
arg = cmh.assert_is_a_number(arg)
return _Sum(self, -arg)
else:
return _Sum(self, -arg)
@overload
def __rsub__(self, arg: LinearExprT) -> LinearExprT:
...
@overload
def __rsub__(self, arg: ObjLinearExprT) -> ObjLinearExprT:
...
def __rsub__(self, arg):
return _Sum(-self, arg)
@overload
def __mul__(self, arg: LinearExprT) -> LinearExprT:
...
@overload
def __mul__(self, arg: ObjLinearExprT) -> ObjLinearExprT:
...
def __mul__(self, arg):
arg = cmh.assert_is_a_number(arg)
if cmh.is_one(arg):
return self
@@ -424,7 +468,15 @@ class LinearExpr:
return 0
return _ProductCst(self, arg)
@overload
def __rmul__(self, arg: LinearExprT) -> LinearExprT:
...
@overload
def __rmul__(self, arg: ObjLinearExprT) -> ObjLinearExprT:
...
def __rmul__(self, arg):
arg = cmh.assert_is_a_number(arg)
if cmh.is_one(arg):
return self