testing run to use the dict comparison approach

This commit is contained in:
Adam Nelson 2016-08-14 12:09:59 -04:00
parent 6cee5843dd
commit c91744d2d5
2 changed files with 6 additions and 7 deletions

View file

@ -57,8 +57,8 @@ class Product(object):
if (self.particle != other.particle or
self.decay_rate != other.decay_rate or
self.emission_mode != other.emission_mode or
self.distribution.all() != other.distribution.all() or
self.applicability.all() != other.applicability.all() or
not np.narray_equal(self.distribution, other.distribution) or
not np.narray_equal(self.applicability, other.applicability) or
self.yield_ != other.yield_):
eqval = False
return eqval

View file

@ -38,11 +38,10 @@ class UncorrelatedAngleEnergy(AngleEnergy):
if not isinstance(other, type(self)):
return NotImplemented
else:
eqval = True
if (self.angle != other.angle or
self.energy != other.energy):
eqval = False
return eqval
if self.__dict__ != other.__dict__:
return False
else:
return True
@property
def angle(self):