Skip to content

return frequency response for 0 and 1-state systems directly #663

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
bnavigator merged 2 commits into from
Nov 3, 2021
Merged

return frequency response for 0 and 1-state systems directly #663

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
433c136
return frequency response for 0 and 1-state systems directly
bnavigator Nov 2, 2021
5355b02
only return fast in array, not matrix
bnavigator Nov 2, 2021
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
Prev Previous commit
only return fast in array, not matrix
  • Loading branch information
@bnavigator
bnavigator committed Nov 2, 2021
commit 5355b025f90ed0838f3e540f8983aa37ce504a43
22 changes: 12 additions & 10 deletions control/statesp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,16 +889,18 @@ def horner(self, x, warn_infinite=True):
x_arr = np.atleast_1d(x).astype(complex, copy=False)

# return fast on systems with 0 or 1 state
if self.nstates == 0:
return self.D[:, :, np.newaxis] \
* np.ones_like(x_arr, dtype=complex)
if self.nstates == 1:
with np.errstate(divide='ignore', invalid='ignore'):
out = (self.C[:, :, np.newaxis]
* (self.B[:, :, np.newaxis] / (x_arr - self.A[0, 0]))
+ self.D[:, :, np.newaxis])
out[np.isnan(out)] = complex(np.inf, np.nan)
return out
if not config.defaults['statesp.use_numpy_matrix']:
if self.nstates == 0:
return self.D[:, :, np.newaxis] \
* np.ones_like(x_arr, dtype=complex)
if self.nstates == 1:
with np.errstate(divide='ignore', invalid='ignore'):
out = self.C[:, :, np.newaxis] \
/ (x_arr - self.A[0, 0]) \
* self.B[:, :, np.newaxis] \
+ self.D[:, :, np.newaxis]
out[np.isnan(out)] = complex(np.inf, np.nan)
return out

try:
out = self.slycot_laub(x_arr)
Expand Down