Skip to content

TransferFunction array priority plus system type conversion checking #498

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 12 commits into from
Jan 8, 2021
Merged

TransferFunction array priority plus system type conversion checking #498

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb8132e
dev instructions
sawyerbfuller Dec 21, 2020
51612df
Merge branch 'master' of https://github.com/sawyerbfuller/python-control
murrayrm Jan 6, 2021
4ad565f
Merge branch 'call-method' of https://github.com/sawyerbfuller/python…
murrayrm Jan 7, 2021
85c9e7f
Merge branch 'master' of https://github.com/python-control/python-con…
murrayrm Jan 8, 2021
8793d78
set array_priority=11 for TransferFunction, to match StateSpace
murrayrm Jan 3, 2021
bd77d71
update _convert_to_transfer_function to allow 0D and 1D arrays
murrayrm Jan 3, 2021
4b7bf8a
rename _convertToX to _convert_to_x + statesp/ndarray unit tests
murrayrm Jan 3, 2021
94b6209
fix converstion exceptions to be TypeError
murrayrm Jan 4, 2021
67a0561
add unit tests for checking type converstions
murrayrm Jan 4, 2021
4a24c84
update LinearIOSystem.__rmul__ for Python2/Python3 consistency
murrayrm Jan 4, 2021
f0593fa
add (skipped) function for desired binary operator conversions
murrayrm Jan 5, 2021
e910c22
Update control/tests/type_conversion_test.py
murrayrm Jan 5, 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
Next Next commit
set array_priority=11 for TransferFunction, to match StateSpace
  • Loading branch information
@murrayrm
murrayrm committed Jan 8, 2021
commit 8793d780a0ed83cc7b97e94de88a1aa72b7463f9
19 changes: 19 additions & 0 deletions control/tests/xferfcn_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

import numpy as np
import pytest
import operator

import control as ct
from control.statesp import StateSpace, _convertToStateSpace, rss
from control.xferfcn import TransferFunction, _convert_to_transfer_function, \
ss2tf
Expand Down Expand Up @@ -1022,3 +1024,20 @@ def test_returnScipySignalLTI_error(self, mimotf):
mimotf.returnScipySignalLTI()
with pytest.raises(ValueError):
mimotf.returnScipySignalLTI(strict=True)

@pytest.mark.parametrize(
"op",
[pytest.param(getattr(operator, s), id=s) for s in ('add', 'sub', 'mul')])
@pytest.mark.parametrize(
"tf, arr",
[# pytest.param(ct.tf([1], [0.5, 1]), np.array(2.), id="0D scalar"),
# pytest.param(ct.tf([1], [0.5, 1]), np.array([2.]), id="1D scalar"),
pytest.param(ct.tf([1], [0.5, 1]), np.array([[2.]]), id="2D scalar")])
def test_xferfcn_ndarray_precedence(op, tf, arr):
# Apply the operator to the transfer function and array
result = op(tf, arr)
assert isinstance(result, ct.TransferFunction)

# Apply the operator to the array and transfer function
result = op(arr, tf)
assert isinstance(result, ct.TransferFunction)
3 changes: 3 additions & 0 deletions control/xferfcn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ class TransferFunction(LTI):
>>> G = (s + 1)/(s**2 + 2*s + 1)
"""

# Give TransferFunction._rmul_() priority for ndarray * TransferFunction
__array_priority__ = 11 # override ndarray and matrix types

def __init__(self, *args, **kwargs):
"""TransferFunction(num, den[, dt])

Expand Down