Fix delcapify for functions #113

doc/circuits.rst

@@ -315,7 +315,7 @@ The system of equations can be formulated in matrix form as :math:`\mathbf{A} \m
    ⎢                    2                       2⎥
    ⎣                C₂⋅s                    C₂⋅s ⎦
 
-The system of equations can be shown in a number of forms: `y = Ainv b`, `Ainv b = y`, `A y = b`, and `b = A y`.  The `invert` argument calculates the inverse of the `A` matrix.
+The system of equations can be shown in a number of forms: `y = Ainv b`, `Ainv b = y`, `A y = b`, and `b = A y`.  The `inverse` argument calculates the inverse of the `A` matrix.
 
 The matrix is returned by the `A` attribute, the vector of unknowns by the `y` attribute, and the result vector by the `b` attribute.
 
@@ -425,7 +425,7 @@ The system of equations can be formulated in matrix form as :math:`\mathbf{A} \m
    ⎢ 0             0                  ────         ──── + ────⎥
    ⎣                                  R₂⋅s         R₃⋅s   R₂⋅s⎦
 
-The system of equations can be shown in a number of forms: `y = Ainv b`, `Ainv b = y`, `A y = b`, and `b = A y`.  The `invert` argument calculates the inverse of the `A` matrix.
+The system of equations can be shown in a number of forms: `y = Ainv b`, `Ainv b = y`, `A y = b`, and `b = A y`.  The `invert` argument calculates the inverse of the `A` matrix (see :ref:`system-of-equations`).
 
 The matrix is returned by the `A` attribute, the vector of unknowns by the `y` attribute, and the result vector by the `b` attribute.
 
@@ -508,6 +508,7 @@ The equations are similar for the transient response:
                ⎜⎢                             ⎥⎟
                ⎝⎣ 0    1      -1      0  -L₁⋅s⎦⎠
 
+See :ref:`system-of-equations` for formatting of the equations.
 
 .. _state-space-analysis:
 
@@ -938,3 +939,12 @@ between accuracy and stability.
 Here's an example of using the backward-Euler integration method:
 
    >>> results = cct.sim(tv, integrator='backward-euler')
+
+
+.. _system-of-equations:
+
+
+System of equations
+===================
+
+A system of equations can be shown in a number of forms: `y = Ainv b`, `Ainv b = y`, `A y = b`, and `b = A y`.  The `invert` argument calculates the inverse of the `A` matrix (see :ref:`system-of-equations`).

lcapy/expr.py

@@ -4201,8 +4201,9 @@ def delcapify(expr):
         for key, val in expr.items():
             ret[delcapify(key)] = delcapify(val)
         return ret
-    elif hasattr(expr, 'expr'):
-        return expr.expr
+    elif hasattr(expr, 'sympy'):
+        # Note, SymPy functions have an expr attribute
+        return expr.sympy
 
     return expr
 

lcapy/statespace.py

@@ -12,9 +12,9 @@
 from .tmatrix import TimeDomainMatrix
 from .nmatrix import DiscreteTimeDomainMatrix
 from .statespacebase import StateSpaceBase
-from .texpr import t, texpr
+from .texpr import texpr
 from .equation import Equation
-from .sym import ssym
+from .sym import ssym, tsym
 from sympy import diag, eye, MatMul, MatAdd, Derivative
 
 
@@ -45,7 +45,7 @@ def x(self):
     def dotx(self):
         """Time derivative of state variable vector."""
 
-        return TimeDomainMatrix([Derivative(x1, t) for x1 in self.x.sympy])
+        return TimeDomainMatrix([Derivative(x1, tsym) for x1 in self.x.sympy])
 
     @property
     def x0(self):