Renamed Equality to EqualityMixin

openmc/data/ace.py

@@ -22,7 +22,7 @@ import sys
 
 import numpy as np
 
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 
 if sys.version_info[0] >= 3:
@@ -133,7 +133,7 @@ def get_table(filename, name=None):
                              .format(name))
 
 
-class Library(Equality):
+class Library(EqualityMixin):
     """A Library objects represents an ACE-formatted file which may contain
     multiple tables with data.
 
@@ -355,7 +355,7 @@ class Library(Equality):
             lines = [ace_file.readline() for i in range(13)]
 
 
-class Table(Equality):
+class Table(EqualityMixin):
     """ACE cross section table
 
     Parameters

openmc/data/angle_distribution.py

@@ -4,12 +4,12 @@ from numbers import Real
 import numpy as np
 
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 from openmc.stats import Univariate, Tabular, Uniform
 from .function import INTERPOLATION_SCHEME
 
 
-class AngleDistribution(Equality):
+class AngleDistribution(EqualityMixin):
     """Angle distribution as a function of incoming energy
 
     Parameters

openmc/data/angle_energy.py

@@ -1,10 +1,10 @@
 from abc import ABCMeta, abstractmethod
 
 import openmc.data
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 
-class AngleEnergy(Equality):
+class AngleEnergy(EqualityMixin):
     """Distribution in angle and energy of a secondary particle."""
 
     __metaclass = ABCMeta

openmc/data/energy_distribution.py

@@ -8,10 +8,10 @@ import numpy as np
 from .function import Tabulated1D, INTERPOLATION_SCHEME
 from openmc.stats.univariate import Univariate, Tabular, Discrete, Mixture
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 
-class EnergyDistribution(Equality):
+class EnergyDistribution(EqualityMixin):
     """Abstract superclass for all energy distributions."""
 
     __metaclass__ = ABCMeta

openmc/data/fission_energy.py

@@ -9,7 +9,7 @@ from .data import ATOMIC_SYMBOL
 from .endf_utils import read_float, read_CONT_line, identify_nuclide
 from .function import Function1D, Tabulated1D, Polynomial, Sum
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 if sys.version_info[0] >= 3:
     basestring = str
@@ -190,7 +190,7 @@ def write_compact_458_library(endf_files, output_name='fission_Q_data.h5',
     out.close()
 
 
-class FissionEnergyRelease(Equality):
+class FissionEnergyRelease(EqualityMixin):
     """Energy relased by fission reactions.
 
     Energy is carried away from fission reactions by many different particles.

openmc/data/function.py

@@ -5,13 +5,13 @@ from numbers import Real, Integral
 import numpy as np
 
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 INTERPOLATION_SCHEME = {1: 'histogram', 2: 'linear-linear', 3: 'linear-log',
                         4: 'log-linear', 5: 'log-log'}
 
 
-class Function1D(Equality):
+class Function1D(EqualityMixin):
     """A function of one independent variable with HDF5 support."""
 
     __metaclass__ = ABCMeta
@@ -390,7 +390,7 @@ class Polynomial(np.polynomial.Polynomial, Function1D):
         return cls(dataset.value)
 
 
-class Sum(Equality):
+class Sum(EqualityMixin):
     """Sum of multiple functions.
 
     This class allows you to create a callable object which represents the sum

openmc/data/library.py

@@ -3,11 +3,11 @@ import xml.etree.ElementTree as ET
 
 import h5py
 
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 from openmc.clean_xml import clean_xml_indentation
 
 
-class DataLibrary(Equality):
+class DataLibrary(EqualityMixin):
     def __init__(self):
         self.libraries = []
 

openmc/data/neutron.py

@@ -15,13 +15,13 @@ from .product import Product
 from .reaction import Reaction, _get_photon_products
 from .urr import ProbabilityTables
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 if sys.version_info[0] >= 3:
     basestring = str
 
 
-class IncidentNeutron(Equality):
+class IncidentNeutron(EqualityMixin):
     """Continuous-energy neutron interaction data.
 
     Instances of this class are not normally instantiated by the user but rather

openmc/data/product.py

@@ -5,7 +5,7 @@ import sys
 import numpy as np
 
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 from .function import Tabulated1D, Polynomial, Function1D
 from .angle_energy import AngleEnergy
 
@@ -13,7 +13,7 @@ if sys.version_info[0] >= 3:
     basestring = str
 
 
-class Product(Equality):
+class Product(EqualityMixin):
     """Secondary particle emitted in a nuclear reaction
 
     Parameters

openmc/data/reaction.py

@@ -7,7 +7,7 @@ from warnings import warn
 import numpy as np
 
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 from openmc.stats import Uniform
 from .angle_distribution import AngleDistribution
 from .angle_energy import AngleEnergy
@@ -251,7 +251,7 @@ def _get_photon_products(ace, rx):
     return photons
 
 
-class Reaction(Equality):
+class Reaction(EqualityMixin):
     """A nuclear reaction
 
     A Reaction object represents a single reaction channel for a nuclide with

openmc/data/thermal.py

@@ -7,7 +7,7 @@ import numpy as np
 import h5py
 
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 from .ace import Table, get_table
 from .angle_energy import AngleEnergy
 from .function import Tabulated1D
@@ -62,7 +62,7 @@ def get_thermal_name(name):
             return 'c_' + name
 
 
-class CoherentElastic(Equality):
+class CoherentElastic(EqualityMixin):
     r"""Coherent elastic scattering data from a crystalline material
 
     Parameters
@@ -149,7 +149,7 @@ class CoherentElastic(Equality):
         return cls(bragg_edges, factors)
 
 
-class ThermalScattering(Equality):
+class ThermalScattering(EqualityMixin):
     """A ThermalScattering object contains thermal scattering data as represented by
     an S(alpha, beta) table.
 

openmc/data/urr.py

@@ -4,10 +4,10 @@ from numbers import Integral, Real
 import numpy as np
 
 import openmc.checkvalue as cv
-from openmc.mixin import Equality
+from openmc.mixin import EqualityMixin
 
 
-class ProbabilityTables(Equality):
+class ProbabilityTables(EqualityMixin):
     r"""Unresolved resonance region probability tables.
 
     Parameters

openmc/mixin.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 
-class Equality(object):
+class EqualityMixin(object):
     """A Class which provides generic __eq__ and __ne__ functionality which
     can easily be inherited by downstream classes.
     """