From 42c85c00b3ed474312c4b66a3da0e8208c60d231 Mon Sep 17 00:00:00 2001 From: Vivien Maisonneuve Date: Tue, 19 Aug 2014 11:29:04 +0200 Subject: [PATCH] Fix Symbol == LinExpr comparisons --- linpy/linexprs.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/linpy/linexprs.py b/linpy/linexprs.py index 492ea9e..e4ed1cc 100644 --- a/linpy/linexprs.py +++ b/linpy/linexprs.py @@ -247,9 +247,10 @@ class LinExpr: """ Test whether two linear expressions are equal. """ - return isinstance(other, LinExpr) and \ - self._coefficients == other._coefficients and \ - self._constant == other._constant + if isinstance(other, LinExpr): + return self._coefficients == other._coefficients and \ + self._constant == other._constant + return NotImplemented def __le__(self, other): from .polyhedra import Le @@ -497,7 +498,9 @@ class Symbol(LinExpr): return True def __eq__(self, other): - return self.sortkey() == other.sortkey() + if isinstance(other, Symbol): + return self.sortkey() == other.sortkey() + return NotImplemented def asdummy(self): """ -- 2.20.1