updated isort's + remove extraneous spaces

Author: murrayrm

control/bdalg.py

@@ -637,7 +637,7 @@ def split_tf(transfer_function):
                                             array([1, 1]),
                                             name='G', outputs=1, inputs=1)]],
           dtype=object)
-    
+
     """
     tf_split_lst = []
     for i_out in range(transfer_function.noutputs):

control/flatsys/__init__.py

@@ -29,14 +29,11 @@
 
 # Basis function families
 from .basis import BasisFamily
-from .poly import PolyFamily
 from .bezier import BezierFamily
 from .bspline import BSplineFamily
-
+# Package functions
+from .flatsys import FlatSystem, flatsys, point_to_point, solve_flat_ocp
+from .linflat import LinearFlatSystem
+from .poly import PolyFamily
 # Classes
 from .systraj import SystemTrajectory
-from .flatsys import FlatSystem, flatsys
-from .linflat import LinearFlatSystem
-
-# Package functions
-from .flatsys import point_to_point, solve_flat_ocp

control/flatsys/bezier.py

@@ -13,8 +13,10 @@
 
 import numpy as np
 from scipy.special import binom, factorial
+
 from .basis import BasisFamily
 
+
 class BezierFamily(BasisFamily):
     r"""Bezier curve basis functions.
 

control/flatsys/bspline.py

@@ -10,9 +10,11 @@
 """
 
 import numpy as np
-from .basis import BasisFamily
 from scipy.interpolate import BSpline, splev
 
+from .basis import BasisFamily
+
+
 class BSplineFamily(BasisFamily):
     """B-spline basis functions.
 

control/flatsys/linflat.py

@@ -5,10 +5,11 @@
 
 """
 
-import numpy as np
 import control
-from .flatsys import FlatSystem
+import numpy as np
+
 from ..statesp import StateSpace
+from .flatsys import FlatSystem
 
 
 class LinearFlatSystem(FlatSystem, StateSpace):

control/flatsys/poly.py

@@ -12,8 +12,10 @@
 
 import numpy as np
 from scipy.special import factorial
+
 from .basis import BasisFamily
 
+
 class PolyFamily(BasisFamily):
     r"""Polynomial basis functions.
 

control/lti.py

@@ -8,15 +8,16 @@
 """
 
 import math
+from typing import Callable
 from warnings import warn
 
 import numpy as np
 from numpy import abs, angle, real
 
+import control
+
 from . import config
 from .iosys import InputOutputSystem
-import control
-from typing import Callable
 
 __all__ = ['poles', 'zeros', 'damp', 'evalfr', 'frequency_response',
            'freqresp', 'dcgain', 'bandwidth', 'LTI']
@@ -216,7 +217,7 @@ def ispassive(self):
         # importing here prevents circular dependancy
         from control.passivity import ispassive
         return ispassive(self)
-    
+
     def feedback(self, other=1, sign=-1):
         raise NotImplementedError(f"feedback not implemented for base {self.__class__.__name__} objects")
 

control/matlab/wrappers.py

@@ -4,15 +4,16 @@
 
 """
 
-import numpy as np
-from scipy.signal import zpk2tf
 import warnings
 from warnings import warn
 
+import numpy as np
+from scipy.signal import zpk2tf
+
+from ..exception import ControlArgument
+from ..lti import LTI
 from ..statesp import ss
 from ..xferfcn import tf
-from ..lti import LTI
-from ..exception import ControlArgument
 
 __all__ = ['bode', 'nyquist', 'ngrid', 'rlocus', 'pzmap', 'dcgain', 'connect']
 
@@ -127,7 +128,7 @@ def nyquist(*args, plot=True, **kwargs):
         Frequencies in rad/s.
 
     """
-    from ..freqplot import nyquist_response, nyquist_plot
+    from ..freqplot import nyquist_plot, nyquist_response
 
     # If first argument is a list, assume python-control calling format
     if hasattr(args[0], '__iter__'):
@@ -311,6 +312,8 @@ def pzmap(*args, **kwargs):
 
 
 from ..nichols import nichols_grid
+
+
 def ngrid():
     return nichols_grid()
 ngrid.__doc__ = nichols_grid.__doc__
@@ -378,6 +381,8 @@ def dcgain(*args):
 
 
 from ..bdalg import connect as ct_connect
+
+
 def connect(*args):
     """connect(sys, Q, inputv, outputv)
 

control/nlsys.py

@@ -25,8 +25,8 @@
 from . import config
 from .iosys import InputOutputSystem, _parse_spec, _process_iosys_keywords, \
     _process_signal_list, common_timebase, iosys_repr, isctime, isdtime
-from .timeresp import _check_convert_array, _process_time_response, \
-    TimeResponseData, TimeResponseList
+from .timeresp import TimeResponseData, TimeResponseList, \
+    _check_convert_array, _process_time_response
 
 __all__ = ['NonlinearIOSystem', 'InterconnectedSystem', 'nlsys',
            'input_output_response', 'find_eqpt', 'linearize',

control/statesp.py

@@ -21,13 +21,15 @@
 import numpy as np
 import scipy as sp
 import scipy.linalg
-from numpy import any, array, asarray, concatenate, cos, delete, empty, \
-    exp, eye, isinf, ones, pad, sin, squeeze, zeros
+from numpy import any, array, asarray, concatenate, cos, delete, empty, exp, \
+    eye, isinf, ones, pad, sin, squeeze, zeros
 from numpy.linalg import LinAlgError, eigvals, matrix_rank, solve
 from numpy.random import rand, randn
 from scipy.signal import StateSpace as signalStateSpace
 from scipy.signal import cont2discrete
 
+import control
+
 from . import config
 from .exception import ControlMIMONotImplemented, ControlSlycot, slycot_check
 from .frdata import FrequencyResponseData
@@ -36,7 +38,6 @@
     common_timebase, iosys_repr, isdtime, issiso
 from .lti import LTI, _process_frequency_response
 from .nlsys import InterconnectedSystem, NonlinearIOSystem
-import control
 
 try:
     from slycot import ab13dd
@@ -1432,7 +1433,7 @@ def output(self, t, x, u=None, params=None):
                 raise ValueError("len(u) must be equal to number of inputs")
             return (self.C @ x).reshape((-1,)) \
                 + (self.D @ u).reshape((-1,))  # return as row vector
-        
+
     # convenience aliase, import needs to go over the submodule to avoid circular imports
     initial_response = control.timeresp.initial_response