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

finish support for python3

Browse Source
This commit is contained in:
Laurent Perron
2015-12-09 22:25:26 +01:00
parent 7c58ce62f9
commit f0e6701d32
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/linear_solver/python/linear_solver.swig
View File

@@ -69,44 +69,47 @@ from ortools.linear_solver.linear_solver_natural_api import LinearConstraint
// particular, SWIG's %define won't work because they get prepended with a
// C-style comment "/*...*/" upon expansion, which breaks the python code.
%pythoncode {
def IsConstant(self, expr):
return isinstance(expr, numbers.Number)
def __add__(self, expr):
if isinstance(expr, (int, long, float)):
if self.IsConstant(expr):
return SumCst(self, expr)
else:
return Sum(self, expr)
def __radd__(self, cst):
if isinstance(cst, (int, long, float)):
if self.IsConstant(cst):
return SumCst(self, cst)
else:
raise TypeError
def __sub__(self, expr):
if isinstance(expr, (int, long, float)):
if self.IsConstant(expr):
return SumCst(self, -expr)
else:
return Sum(self, ProductCst(expr, -1))
def __rsub__(self, cst):
if isinstance(cst, (int, long, float)):
if self.IsConstant(cst):
return SumCst(ProductCst(self, -1), cst)
else:
raise TypeError
def __mul__(self, cst):
if isinstance(cst, (int, long, float)):
if self.IsConstant(cst):
return ProductCst(self, cst)
else:
raise TypeError
def __rmul__(self, cst):
if isinstance(cst, (int, long, float)):
if self.IsConstant(cst):
return ProductCst(self, cst)
else:
raise TypeError
def __div__(self, cst):
if isinstance(cst, (int, long, float)):
if self.IsConstant(cst):
if cst == 0.0:
raise ZeroDivisionError
else:
@@ -115,7 +118,7 @@ from ortools.linear_solver.linear_solver_natural_api import LinearConstraint
raise TypeError
def __truediv__(self, cst):
if isinstance(cst, (int, long, float)):
if self.IsConstant(cst):
if cst == 0.0:
raise ZeroDivisionError
else:
@@ -127,19 +130,19 @@ from ortools.linear_solver.linear_solver_natural_api import LinearConstraint
return ProductCst(self, -1)
def __eq__(self, arg):
if isinstance(arg, (int, long, float)):
if self.IsConstant(arg):
return LinearConstraint(self, arg, arg)
else:
return LinearConstraint(Sum(self, ProductCst(arg, -1)), 0.0, 0.0)
def __ge__(self, arg):
if isinstance(arg, (int, long, float)):
if self.IsConstant(arg):
return LinearConstraint(self, arg, 1e308)
else:
return LinearConstraint(Sum(self, ProductCst(arg, -1)), 0.0, 1e308)
def __le__(self, arg):
if isinstance(arg, (int, long, float)):
if self.IsConstant(arg):
return LinearConstraint(self, -1e308, arg)
else:
return LinearConstraint(Sum(self, ProductCst(arg, -1)), -1e308, 0.0)