Skip to content

Commit d601d38

Browse files
committed
fix up docstrings for append() methods after rebase
1 parent b875987 commit d601d38

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

control/frdata.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,19 @@ def append(self, other):
848848
"""Append a second model to the present model.
849849
850850
The second model is converted to FRD if necessary, inputs and
851-
outputs are appended and their order is preserved"""
851+
outputs are appended and their order is preserved.
852+
853+
Parameters
854+
----------
855+
other : `LTI`
856+
System to be appended.
857+
858+
Returns
859+
-------
860+
sys : `FrequencyResponseData`
861+
System model with `other` appended to `self`.
862+
863+
"""
852864
other = _convert_to_frd(other, omega=self.omega, inputs=other.ninputs,
853865
outputs=other.noutputs)
854866

control/statesp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,11 +1280,11 @@ def append(self, other):
12801280
"""Append a second model to the present model.
12811281
12821282
The second model is converted to state-space if necessary, inputs and
1283-
outputs are appended and their order is preserved
1283+
outputs are appended and their order is preserved.
12841284
12851285
Parameters
12861286
----------
1287-
other : `StateSpace`
1287+
other : `StateSpace` or `TransferFunction`
12881288
System to be appended.
12891289
12901290
Returns

control/xferfcn.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,19 @@ def append(self, other):
899899
"""Append a second model to the present model.
900900
901901
The second model is converted to a transfer function if necessary,
902-
inputs and outputs are appended and their order is preserved"""
902+
inputs and outputs are appended and their order is preserved.
903+
904+
Parameters
905+
----------
906+
other : `StateSpace` or `TransferFunction`
907+
System to be appended.
908+
909+
Returns
910+
-------
911+
sys : `TransferFunction`
912+
System model with `other` appended to `self`.
913+
914+
"""
903915
other = _convert_to_transfer_function(other)
904916

905917
new_tf = bdalg.combine_tf([

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy