Collapse ExpressionState to a single class

ExpressionState has the usual mixin, whereby one splits the ABC into
smaller parts called mixins, however this class only had one mixin
and it makes no sense to have three classes instead of one. This class
was simply not complex enough to make it worth maintaining all these
files.

I do not see a use case that would extend ExpressionState in a way that
would introduce enough complexity for the mixin structure to be necessary.
But it that were to happen in the future it is easy to reintroduce this
structure I just deleted.

In addition to reducing complexity this also fixes the inconsistent use
of ExpressionStateMixin and ExpressionState across the mixin classes
of Expression.

1 files changed, 1 insertions, 1 deletions

diff --git a/polymatrix/expression/mixins/derivativeexprmixin.py b/polymatrix/expression/mixins/derivativeexprmixin.py
index 31a1e31..dab1b41 100644
--- a/polymatrix/expression/mixins/derivativeexprmixin.py
+++ b/polymatrix/expression/mixins/derivativeexprmixin.py
@@ -4,7 +4,7 @@ import typing
 from polymatrix.polymatrix.init import init_poly_matrix
 from polymatrix.expression.mixins.expressionbasemixin import ExpressionBaseMixin
 from polymatrix.polymatrix.abc import PolyMatrix
-from polymatrix.expressionstate.abc import ExpressionState
+from polymatrix.expressionstate import ExpressionState
 from polymatrix.expression.utils.getderivativemonomials import differentiate_polynomial
 from polymatrix.expression.utils.getvariableindices import (
     get_variable_indices_from_variable,