Skip to content

Small updates from Caltech CDS 110 #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
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
3 changes: 2 additions & 1 deletion control/lti.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ def frequency_response(self, omega=None, squeeze=None):
response = self(s)
return FrequencyResponseData(
response, omega, return_magphase=True, squeeze=squeeze,
dt=self.dt, sysname=self.name, plot_type='bode')
dt=self.dt, sysname=self.name, inputs=self.input_labels,
outputs=self.output_labels, plot_type='bode')

def dcgain(self):
"""Return the zero-frequency gain"""
Expand Down
6 changes: 3 additions & 3 deletions control/nlsys.py
Original file line number Diff line number Diff line change
Expand Up @@ -1746,9 +1746,9 @@ def find_eqpt(sys, x0, u0=None, y0=None, t=0, params=None,

# Make sure the input arguments match the sizes of the system
if len(x0) != nstates or \
(u0 is not None and len(u0) != ninputs) or \
(y0 is not None and len(y0) != noutputs) or \
(dx0 is not None and len(dx0) != nstates):
(u0 is not None and iu is None and len(u0) != ninputs) or \
(y0 is not None and iy is None and len(y0) != noutputs) or \
(dx0 is not None and idx is None and len(dx0) != nstates):
raise ValueError("length of input arguments does not match system")

# Update the parameter values
Expand Down
Loading