Skip to content

Commit 1f8d2e6

Browse files
committed
fix up docstrings, unit test for append() methods after rebase
1 parent bb4ff1e commit 1f8d2e6

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

control/statesp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1273,7 +1273,7 @@ def append(self, other):
12731273
12741274
Parameters
12751275
----------
1276-
other : `StateSpace`
1276+
other : `StateSpace` or `TransferFunction`
12771277
System to be appended.
12781278
12791279
Returns

control/tests/statesp_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"""
99

1010
import operator
11+
import platform
1112

1213
import numpy as np
1314
import pytest

control/xferfcn.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -898,12 +898,12 @@ def feedback(self, other=1, sign=-1):
898898
def append(self, other):
899899
"""Append a second model to the present model.
900900
901-
The second model is converted to FRD if necessary, inputs and
902-
outputs are appended and their order is preserved.
901+
The second model is converted to a transfer function if necessary,
902+
inputs and outputs are appended and their order is preserved.
903903
904904
Parameters
905905
----------
906-
other : `LTI`
906+
other : `StateSpace` or `TransferFunction`
907907
System to be appended.
908908
909909
Returns

0 commit comments

Comments
 (0)