Skip to content

dcgain and step_info post PR merge cleanup #582

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 20, 2021
Merged

dcgain and step_info post PR merge cleanup #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/statesp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ def dcgain(self, warn_infinite=False):

Returns
-------
gain : (outputs, inputs) ndarray or scalar
gain : (noutputs, ninputs) ndarray or scalar
Array or scalar value for SISO systems, depending on
config.defaults['control.squeeze_frequency_response'].
The value of the array elements or the scalar is either the
Expand Down
2 changes: 1 addition & 1 deletion control/timeresp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ def step_info(sysdata, T=None, T_num=None, yfinal=None,
peak_time = T[peak_index]

# SteadyStateValue
steady_state_value = InfValue.real
steady_state_value = InfValue

retij = {
'RiseTime': rise_time,
Expand Down
3 changes: 1 addition & 2 deletions control/xferfcn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ def dcgain(self, warn_infinite=False):

Returns
-------
gain : (outputs, inputs) ndarray or scalar
gain : (noutputs, ninputs) ndarray or scalar
Array or scalar value for SISO systems, depending on
config.defaults['control.squeeze_frequency_response'].
The value of the array elements or the scalar is either the
Expand All @@ -1080,7 +1080,6 @@ def dcgain(self, warn_infinite=False):
For real valued systems, the empty imaginary part of the
complex zero-frequency response is discarded and a real array or
scalar is returned.

"""
return self._dcgain(warn_infinite)

Expand Down