small tweaks to comments, docstrings, unit tests · python-control/python-control@574cf69

@@ -512,7 +512,7 @@ def test_lqr_discrete(self):

512512

K, S, E = ct.dlqr(csys, Q, R)

513513514514

@pytest.mark.parametrize(

515-

'nstates, noutputs, ninputs, nintegrators, type',

515+

'nstates, noutputs, ninputs, nintegrators, type_',

516516

[(2, 0, 1, 0, None),

517517

(2, 1, 1, 0, None),

518518

(4, 0, 2, 0, None),

@@ -525,7 +525,7 @@ def test_lqr_discrete(self):

525525

(4, 3, 2, 2, 'nonlinear'),

526526

])

527527

def test_statefbk_iosys(

528-

self, nstates, ninputs, noutputs, nintegrators, type):

528+

self, nstates, ninputs, noutputs, nintegrators, type_):

529529

# Create the system to be controlled (and estimator)

530530

# TODO: make sure it is controllable?

531531

if noutputs == 0:

@@ -571,14 +571,14 @@ def test_statefbk_iosys(

571571

# Create an I/O system for the controller

572572

ctrl, clsys = ct.create_statefbk_iosystem(

573573

sys, K, integral_action=C_int, estimator=est,

574-

controller_type=type, name=type)

574+

controller_type=type_, name=type_)

575575576576

# Make sure the name got set correctly

577-

if type is not None:

578-

assert ctrl.name == type

577+

if type_ is not None:

578+

assert ctrl.name == type_

579579580580

# If we used a nonlinear controller, linearize it for testing

581-

if type == 'nonlinear':

581+

if type_ == 'nonlinear':

582582

clsys = clsys.linearize(0, 0)

583583584584

# Make sure the linear system elements are correct