Fix uses of is / ==

This commit is contained in:
Paul Romano 2020-06-16 20:28:02 -05:00
parent 74ea96ebb6
commit d999ce3767
2 changed files with 13 additions and 13 deletions

View file

@ -603,7 +603,7 @@ class Plot(IDManagerMixin):
element.set("color_by", self._color_by)
element.set("type", self._type)
if self._type is 'slice':
if self._type == 'slice':
element.set("basis", self._basis)
subelement = ET.SubElement(element, "origin")

View file

@ -84,27 +84,27 @@ class VolumeTest(PyAPITestHarness):
outstr += 'Iterations: {}\n'.format(volume_calc.iterations)
if i == 3:
assert(volume_calc.trigger_type == 'std_dev')
assert(volume_calc.threshold == self.exp_std_dev)
assert volume_calc.trigger_type == 'std_dev'
assert volume_calc.threshold == self.exp_std_dev
elif i == 4:
assert(volume_calc.trigger_type == 'rel_err')
assert(volume_calc.threshold == self.exp_rel_err)
assert volume_calc.trigger_type == 'rel_err'
assert volume_calc.threshold == self.exp_rel_err
elif i == 5:
assert(volume_calc.trigger_type == 'variance')
assert(volume_calc.threshold == self.exp_variance)
assert volume_calc.trigger_type == 'variance'
assert volume_calc.threshold == self.exp_variance
else:
assert(volume_calc.trigger_type == None)
assert(volume_calc.threshold == None)
assert(volume_calc.iterations == 1)
assert volume_calc.trigger_type is None
assert volume_calc.threshold is None
assert volume_calc.iterations == 1
# if a trigger is applied, make sure the calculation satisfies the trigger
for vol in volume_calc.volumes.values():
if volume_calc.trigger_type == 'std_dev':
assert(vol.std_dev <= self.exp_std_dev)
assert vol.std_dev <= self.exp_std_dev
if volume_calc.trigger_type == 'rel_err':
assert(vol.std_dev/vol.nominal_value <= self.exp_rel_err)
assert vol.std_dev/vol.nominal_value <= self.exp_rel_err
if volume_calc.trigger_type == 'variance':
assert(vol.std_dev * vol.std_dev <= self.exp_variance)
assert vol.std_dev * vol.std_dev <= self.exp_variance
# Write cell volumes and total # of atoms for each nuclide
for uid, volume in sorted(volume_calc.volumes.items()):