Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion control/flatsys/bspline.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __init__(self, breakpoints, degree, smoothness=None, vars=None):
raise NotImplementedError(
"breakpoints for each spline variable not yet supported")
elif breakpoints.ndim != 1:
raise ValueError("breakpoints must be convertable to a 1D array")
raise ValueError("breakpoints must be convertible to a 1D array")
elif breakpoints.size < 2:
raise ValueError("break point vector must have at least 2 values")
elif np.any(np.diff(breakpoints) <= 0):
Expand Down
4 changes: 2 additions & 2 deletions control/nlsys.py
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ def __str__(self):
iosys_repr(sys, format='info'), width=78,
initial_indent=" * ", subsequent_indent=" ")) + "\n"

# Build a list of input, output, and inpout signals

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a misprint. Please look at the context.

# Build a list of input, output, and input/output signals
input_list, output_list, inpout_list = [], [], []
for sys in self.syslist:
input_list += [sys.name + "." + lbl for lbl in sys.input_labels]
Expand Down Expand Up @@ -2641,7 +2641,7 @@ def interconnect(
dprint = lambda s: None if not debug else print(s)

#
# Pre-process connecton list
# Pre-process connection list
#
# Support for various "vector" forms of specifications is handled here,
# by expanding any specifications that refer to more than one signal.
Expand Down
2 changes: 1 addition & 1 deletion control/optimal.py
Original file line number Diff line number Diff line change
Expand Up @@ -2544,7 +2544,7 @@ def disturbance_range_constraint(sys, lb, ub):
# constraint followed by the arguments. However, they are now specified
# directly as SciPy constraint objects.
#
# The _process_constraints() function will covert everything to a consistent
# The _process_constraints() function will convert everything to a consistent
# internal representation (currently a tuple with the constraint type as the
# first element.
#
Expand Down
2 changes: 1 addition & 1 deletion control/phaseplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ def streamplot(
Returns
-------
out : StreamplotSet
Containter object with lines and arrows contained in the
Container object with lines and arrows contained in the
streamplot. See `matplotlib.axes.Axes.streamplot` for details.
Other Parameters
Expand Down
4 changes: 2 additions & 2 deletions control/robust.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def h2syn(P, nmeas, ncon):
"""
# Check for ss system object, need a utility for this?

# TODO: Check for continous or discrete, only continuous supported right now
# TODO: Check for continuous or discrete, only continuous supported right now

try:
from slycot import sb10hd
Expand Down Expand Up @@ -146,7 +146,7 @@ def hinfsyn(P, nmeas, ncon):

# Check for ss system object, need a utility for this?

# TODO: Check for continous or discrete, only continuous supported right now
# TODO: Check for continuous or discrete, only continuous supported right now

try:
from slycot import sb10ad
Expand Down
2 changes: 1 addition & 1 deletion control/statesp.py
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ def zeros(self):
# The QZ algorithm solves the generalized eigenvalue problem: given
# `L = [A, B; C, D]` and `M = [I_nxn 0]`, find all finite lambda
# for which there exist nontrivial solutions of the equation
# `Lz - lamba Mz`.
# `Lz - lambda Mz`.
#
# The generalized eigenvalue problem is only solvable if its
# arguments are square matrices.
Expand Down
2 changes: 1 addition & 1 deletion control/timeplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def _make_line_label(signal_index, signal_labels, trace_index):
# of signals (when overlay_signal is True or plot+inputs = 'overlay'.
#
# Traces are labeled at the top of the first row of plots (regular) or
# the left edge of rows (tranpose).
# the left edge of rows (transpose).
#

# Time units on the bottom
Expand Down
Loading