Skip to content

Feature print zpk #869

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
murrayrm merged 16 commits into from
Mar 25, 2023
Merged

Feature print zpk #869

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5c85459
Add print zpk form
henklaak Feb 21, 2023
57620f1
Fix unittest
henklaak Feb 21, 2023
b36732d
Add fix for precision noise
henklaak Feb 21, 2023
45b5ae4
Cleanup unittest
henklaak Feb 21, 2023
07a859d
Merge branch 'python-control:main' into feature_print_zpk
henklaak Feb 24, 2023
93f7b46
Rework after review
henklaak Feb 24, 2023
d2807b0
Shouldn't have commited the pyproject.toml, revering
henklaak Feb 24, 2023
5652bf0
Fix variable mixup due to inconsistent naming
henklaak Feb 24, 2023
58e9d63
Fix variable mixup due to inconsistent naming
henklaak Feb 24, 2023
521a306
Typos
henklaak Feb 24, 2023
2644874
Add default for xferfcn.display_format
henklaak Feb 25, 2023
8101b31
Update after failed tests
henklaak Feb 25, 2023
8d7ac56
Add default for xferfcn.floating_point_format
henklaak Feb 25, 2023
2ca47e1
Fix improper way of setting defaults in test
henklaak Feb 25, 2023
5f506b2
Merge branch 'python-control:main' into feature_print_zpk
henklaak Mar 5, 2023
6933973
update xferfcn._float2str to be more pythonic per @ilayn
murrayrm Mar 25, 2023
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
Next Next commit
Fix variable mixup due to inconsistent naming
  • Loading branch information
@henklaak
henklaak committed Feb 24, 2023
commit 5652bf025fd7966960029634a195d072d9220619
24 changes: 12 additions & 12 deletions control/xferfcn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,17 +455,17 @@ def __str__(self, var=None):
var = 's' if self.isctime() else 'z'
outstr = ""

for i in range(self.ninputs):
for j in range(self.noutputs):
for ni in range(self.ninputs):
for no in range(self.noutputs):
if mimo:
Comment thread
henklaak marked this conversation as resolved.
outstr += "\nInput %i to output %i:" % (i + 1, j + 1)
outstr += "\nInput %i to output %i:" % (ni + 1, no + 1)

# Convert the numerator and denominator polynomials to strings.
if self.display_format == 'poly':
numstr = _tf_polynomial_to_string(self.num[j][i], var=var)
denstr = _tf_polynomial_to_string(self.den[j][i], var=var)
numstr = _tf_polynomial_to_string(self.num[no][ni], var=var)
denstr = _tf_polynomial_to_string(self.den[no][ni], var=var)
elif self.display_format == 'zpk':
z, p, k = tf2zpk(self.num[j][i], self.den[j][i])
z, p, k = tf2zpk(self.num[j][i], self.den[no][ni])
numstr = _tf_factorized_polynomial_to_string(z, gain=k, var=var)
denstr = _tf_factorized_polynomial_to_string(p, var=var)

Expand Down Expand Up @@ -505,7 +505,7 @@ def __repr__(self):
def _repr_latex_(self, var=None):
"""LaTeX representation of transfer function, for Jupyter notebook"""

mimo = self.ninputs > 1 or self.noutputs > 1
mimo = not self.issiso()

if var is None:
# ! TODO: replace with standard calls to lti functions
Expand All @@ -516,14 +516,14 @@ def _repr_latex_(self, var=None):
if mimo:
out.append(r"\begin{bmatrix}")

for i in range(self.noutputs):
for j in range(self.ninputs):
for no in range(self.noutputs):
for ni in range(self.ninputs):
# Convert the numerator and denominator polynomials to strings.
if self.display_format == 'poly':
numstr = _tf_polynomial_to_string(self.num[j][i], var=var)
denstr = _tf_polynomial_to_string(self.den[j][i], var=var)
numstr = _tf_polynomial_to_string(self.num[no][ni], var=var)
denstr = _tf_polynomial_to_string(self.den[no][ni], var=var)
elif self.display_format == 'zpk':
z, p, k = tf2zpk(self.num[j][i], self.den[j][i])
z, p, k = tf2zpk(self.num[no][ni], self.den[no][ni])
numstr = _tf_factorized_polynomial_to_string(z, gain=k, var=var)
denstr = _tf_factorized_polynomial_to_string(p, var=var)

Expand Down