Commit c8bd6392 authored by Rasmus Wriedt Larsen's avatar Rasmus Wriedt Larsen
Browse files

Prefer `not self == other` when defining __ne__ in Python

Apparently it is the slightly more correct way of doing thigns, as explained in
https://stackoverflow.com/a/30676267/538973
parent 635e7914
...@@ -158,7 +158,7 @@ class AtomType(object): ...@@ -158,7 +158,7 @@ class AtomType(object):
return other == (self.number, self.name) return other == (self.number, self.name)
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
def set_lj_params(self, eps, rmin, eps14=None, rmin14=None): def set_lj_params(self, eps, rmin, eps14=None, rmin14=None):
""" Sets Lennard-Jones parameters on this atom type """ """ Sets Lennard-Jones parameters on this atom type """
...@@ -990,7 +990,7 @@ class BondType(object): ...@@ -990,7 +990,7 @@ class BondType(object):
return self.k == other.k and self.req == other.req return self.k == other.k and self.req == other.req
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
...@@ -1013,7 +1013,7 @@ class AngleType(object): ...@@ -1013,7 +1013,7 @@ class AngleType(object):
return self.k == other.k and self.theteq == other.theteq return self.k == other.k and self.theteq == other.theteq
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
...@@ -1057,7 +1057,7 @@ class DihedralType(object): ...@@ -1057,7 +1057,7 @@ class DihedralType(object):
self.phase == other.phase) self.phase == other.phase)
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
...@@ -1080,7 +1080,7 @@ class ImproperType(object): ...@@ -1080,7 +1080,7 @@ class ImproperType(object):
return self.k == other.k and self.phieq == other.phieq return self.k == other.k and self.phieq == other.phieq
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
def __repr__(self): def __repr__(self):
return '<ImproperType; k=%s; phieq=%s>' % (self.k, self.phieq) return '<ImproperType; k=%s; phieq=%s>' % (self.k, self.phieq)
...@@ -1118,7 +1118,7 @@ class CmapType(object): ...@@ -1118,7 +1118,7 @@ class CmapType(object):
all([abs(i - j) < TINY for i, j in zip(self.grid, other.grid)])) all([abs(i - j) < TINY for i, j in zip(self.grid, other.grid)]))
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
...@@ -1218,7 +1218,7 @@ class _CmapGrid(object): ...@@ -1218,7 +1218,7 @@ class _CmapGrid(object):
return TypeError('Bad type comparison with _CmapGrid') return TypeError('Bad type comparison with _CmapGrid')
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
def switch_range(self): def switch_range(self):
""" """
......
...@@ -267,7 +267,7 @@ class Quantity(object): ...@@ -267,7 +267,7 @@ class Quantity(object):
def __ne__(self, other): def __ne__(self, other):
""" """
""" """
return not self.__eq__(other) return not self == other
def __lt__(self, other): def __lt__(self, other):
"""Compares two quantities. """Compares two quantities.
......
...@@ -179,7 +179,7 @@ class Unit(object): ...@@ -179,7 +179,7 @@ class Unit(object):
return self.get_name() == other.get_name() return self.get_name() == other.get_name()
def __ne__(self, other): def __ne__(self, other):
return not self.__eq__(other) return not self == other
def __lt__(self, other): def __lt__(self, other):
"""Compare two Units. """Compare two Units.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment