Skip to content

Commit fc8486e

Browse files
committed
rebase cleanup + remove unneeded spaces + header updates
1 parent d517690 commit fc8486e

30 files changed

+142
-199
lines changed

benchmarks/optestim_bench.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ def time_oep_minimizer_methods(minimizer_name, noise_name, initial_guess):
6464
initial_guess = (res.states, V)
6565
else:
6666
initial_guess = None
67-
6867

6968
# Set up optimal estimation function using Gaussian likelihoods for cost
7069
traj_cost = opt.gaussian_likelihood_cost(sys, Rv, Rw)

control/canonical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def observable_form(xsys):
189189

190190

191191
def similarity_transform(xsys, T, timescale=1, inverse=False):
192-
"""Similarity transformation, with option time rescaling.
192+
"""Similarity transformation, with optional time rescaling.
193193
194194
Transform a linear state space system to a new state space representation
195195
z = T x, or x = T z, where T is an invertible matrix.

control/config.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,6 @@ def use_legacy_defaults(version):
335335
#
336336
reset_defaults() # start from a clean slate
337337

338-
# Verions 0.10.2
339-
if major == 0 and minor <= 10 and patch < 2:
340-
set_defaults('iosys', repr_format='eval')
341-
342338
# Version 0.9.2:
343339
if major == 0 and minor < 9 or (minor == 9 and patch < 2):
344340
from math import inf

control/ctrlutil.py

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,17 @@
11
# ctrlutil.py - control system utility functions
22
#
3-
# Author: Richard M. Murray
4-
# Date: 24 May 09
5-
#
6-
# These are some basic utility functions that are used in the control
7-
# systems library and that didn't naturally fit anyplace else.
8-
#
9-
# Copyright (c) 2009 by California Institute of Technology
10-
# All rights reserved.
11-
#
12-
# Redistribution and use in source and binary forms, with or without
13-
# modification, are permitted provided that the following conditions
14-
# are met:
15-
#
16-
# 1. Redistributions of source code must retain the above copyright
17-
# notice, this list of conditions and the following disclaimer.
18-
#
19-
# 2. Redistributions in binary form must reproduce the above copyright
20-
# notice, this list of conditions and the following disclaimer in the
21-
# documentation and/or other materials provided with the distribution.
22-
#
23-
# 3. Neither the name of the California Institute of Technology nor
24-
# the names of its contributors may be used to endorse or promote
25-
# products derived from this software without specific prior
26-
# written permission.
27-
#
28-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
29-
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
30-
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
31-
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CALTECH
32-
# OR THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
33-
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
34-
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
35-
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
36-
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
37-
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
38-
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
39-
# SUCH DAMAGE.
40-
#
41-
# $Id$
3+
# Original author: Richard M. Murray
4+
# Creation date: 24 May 2009
5+
# Use `git shortlog -n -s ctrlutil.py` for full list of contributors
6+
7+
"""Control system utility functions."""
428

439
import math
4410
import warnings
4511

4612
import numpy as np
4713

48-
# Packages that we need access to
49-
from . import lti
14+
from .lti import LTI
5015

5116
__all__ = ['unwrap', 'issys', 'db2mag', 'mag2db']
5217

@@ -96,7 +61,7 @@ def issys(obj):
9661
"""
9762
warnings.warn("issys() is deprecated; use isinstance(obj, ct.LTI)",
9863
FutureWarning, stacklevel=2)
99-
return isinstance(obj, lti.LTI)
64+
return isinstance(obj, LTI)
10065

10166
def db2mag(db):
10267
"""Convert a gain in decibels (dB) to a magnitude.

control/iosys.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def __str__(self):
261261
out += f"\nStates ({self.nstates}): {self.state_labels}"
262262
out += self._dt_repr(separator="\n", space=" ")
263263
return out
264-
264+
265265
def __repr__(self):
266266
return iosys_repr(self, format=self.repr_format)
267267

control/modelsimp.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# modelsimp.py - tools for model simplification
22
#
3-
# Author: Steve Brunton, Kevin Chen, Lauren Padilla
4-
# Date: 30 Nov 2010
5-
#
6-
"""This :mod:`modelsimp` modules contains routines for obtaining
7-
reduced order models for state space systems.
3+
# Original authors: Steve Brunton, Kevin Chen, Lauren Padilla
4+
# Creation date: 30 Nov 2010
5+
6+
"""The :mod:`modelsimp` module contains routines for obtaining reduced
7+
order models for state space systems.
88
99
"""
1010

control/passivity.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# passivity.py
22
#
3-
# Author: Mark Yeatman
4-
#Date: July 17, 2022
3+
# Original author: Mark Yeatman
4+
# Creation date: July 17, 2022
55

66
"""
77
Functions for passive control.

control/robust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# robust.py - tools for robust control
22
#
3-
# Author: Steve Brunton, Kevin Chen, Lauren Padilla
4-
# Date: 24 Dec 2010
3+
# Original authors: Steve Brunton, Kevin Chen, Lauren Padilla
4+
# Creation date: 24 Dec 2010
55

66
"""
77
This file contains routines for obtaining reduced order models.

0 commit comments

Comments
 (0)