Skip to content

Commit 4dbb0cb

Browse files
committed
refactor singular_values_plot into response/plot
1 parent 949dcaf commit 4dbb0cb

5 files changed

Lines changed: 340 additions & 190 deletions

File tree

control/frdata.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ def __init__(self, *args, **kwargs):
218218
self.return_magphase=kwargs.pop('return_magphase', False)
219219
if self.return_magphase not in (True, False):
220220
raise ValueError("unknown return_magphase value")
221+
self._return_singvals=kwargs.pop('_return_singvals', False)
221222

222223
# Determine whether to squeeze the output
223224
self.squeeze=kwargs.pop('squeeze', None)
@@ -601,7 +602,10 @@ def __call__(self, s=None, squeeze=None, return_magphase=None):
601602
def __iter__(self):
602603
fresp = _process_frequency_response(
603604
self, self.omega, self.fresp, squeeze=self.squeeze)
604-
if not self.return_magphase:
605+
if self._return_singvals:
606+
# Legacy processing for singular values
607+
return iter((self.fresp[:, 0, :], self.omega))
608+
elif not self.return_magphase:
605609
return iter((self.omega, fresp))
606610
return iter((np.abs(fresp), np.angle(fresp), self.omega))
607611

0 commit comments

Comments
 (0)