Skip to content

add zpk() function #816

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 2 commits into from
Dec 17, 2022
Merged

add zpk() function #816

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91466d1
add zpk() function
murrayrm Dec 16, 2022
7ee0c0e
fix up copying of signal names
murrayrm Dec 17, 2022
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
fix up copying of signal names
  • Loading branch information
@murrayrm
murrayrm committed Dec 17, 2022
commit 7ee0c0e3358d703e93054bca8e3e34d5c86987c9
1 change: 0 additions & 1 deletion control/statesp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,6 @@ def output(self, t, x, u=None, params=None):


# TODO: add discrete time check
# TODO: copy signal names
def _convert_to_statespace(sys):
"""Convert a system to state space form (if needed).

Expand Down
34 changes: 33 additions & 1 deletion control/tests/xferfcn_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
import operator

import control as ct
from control import StateSpace, TransferFunction, rss, ss2tf, evalfr
from control import StateSpace, TransferFunction, rss, evalfr
from control import ss, ss2tf, tf, tf2ss
from control import isctime, isdtime, sample_system, defaults
from control.statesp import _convert_to_statespace
from control.xferfcn import _convert_to_transfer_function
Expand Down Expand Up @@ -1111,3 +1112,34 @@ def test_zpk(zeros, poles, gain, args, kwargs):

if kwargs.get('name'):
assert sys.name == kwargs.get('name')

@pytest.mark.parametrize("create, args, kwargs, convert", [
(StateSpace, ([-1], [1], [1], [0]), {}, ss2tf),
(StateSpace, ([-1], [1], [1], [0]), {}, ss),
(StateSpace, ([-1], [1], [1], [0]), {}, tf),
(StateSpace, ([-1], [1], [1], [0]), dict(inputs='i', outputs='o'), ss2tf),
(StateSpace, ([-1], [1], [1], [0]), dict(inputs=1, outputs=1), ss2tf),
(StateSpace, ([-1], [1], [1], [0]), dict(inputs='i', outputs='o'), ss),
(StateSpace, ([-1], [1], [1], [0]), dict(inputs='i', outputs='o'), tf),
(TransferFunction, ([1], [1, 1]), {}, tf2ss),
(TransferFunction, ([1], [1, 1]), {}, tf),
(TransferFunction, ([1], [1, 1]), {}, ss),
(TransferFunction, ([1], [1, 1]), dict(inputs='i', outputs='o'), tf2ss),
(TransferFunction, ([1], [1, 1]), dict(inputs=1, outputs=1), tf2ss),
(TransferFunction, ([1], [1, 1]), dict(inputs='i', outputs='o'), tf),
(TransferFunction, ([1], [1, 1]), dict(inputs='i', outputs='o'), ss),
])
def test_copy_names(create, args, kwargs, convert):
# Convert a system with no renaming
sys = create(*args, **kwargs)
cpy = convert(sys)

assert cpy.input_labels == sys.input_labels
assert cpy.input_labels == sys.input_labels
if cpy.nstates is not None and sys.nstates is not None:
assert cpy.state_labels == sys.state_labels

# Relabel inputs and outputs
cpy = convert(sys, inputs='myin', outputs='myout')
assert cpy.input_labels == ['myin']
assert cpy.output_labels == ['myout']
13 changes: 7 additions & 6 deletions control/xferfcn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,16 +1424,13 @@ def _convert_to_transfer_function(sys, inputs=1, outputs=1):
num = squeeze(num) # Convert to 1D array
den = squeeze(den) # Probably not needed

return TransferFunction(
num, den, sys.dt, inputs=sys.input_labels,
outputs=sys.output_labels)
return TransferFunction(num, den, sys.dt)

elif isinstance(sys, (int, float, complex, np.number)):
num = [[[sys] for j in range(inputs)] for i in range(outputs)]
den = [[[1] for j in range(inputs)] for i in range(outputs)]

return TransferFunction(
num, den, inputs=inputs, outputs=outputs)
return TransferFunction(num, den)

elif isinstance(sys, FrequencyResponseData):
raise TypeError("Can't convert given FRD to TransferFunction system.")
Expand Down Expand Up @@ -1623,7 +1620,6 @@ def zpk(zeros, poles, gain, *args, **kwargs):
return TransferFunction(num, den, *args, **kwargs)


# TODO: copy signal names
def ss2tf(*args, **kwargs):

"""ss2tf(sys)
Expand Down Expand Up @@ -1705,6 +1701,11 @@ def ss2tf(*args, **kwargs):
if len(args) == 1:
sys = args[0]
if isinstance(sys, StateSpace):
kwargs = kwargs.copy()
if not kwargs.get('inputs'):
kwargs['inputs'] = sys.input_labels
if not kwargs.get('outputs'):
kwargs['outputs'] = sys.output_labels
return TransferFunction(
_convert_to_transfer_function(sys), **kwargs)
else:
Expand Down