Commitd601d38

committed

fix up docstrings for append() methods after rebase

1 parentb875987 commitd601d38Copy full SHA for d601d38

File tree

+28

-4

lines changed

+28

-4

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -848,7 +848,19 @@ def append(self, other):`
`848`	`848`	`"""Append a second model to the present model.`
`849`	`849`
`850`	`850`	`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`	`+ """`
`852`	`864`	`other=_convert_to_frd(other,omega=self.omega,inputs=other.ninputs,`
`853`	`865`	`outputs=other.noutputs)`
`854`	`866`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1280,11 +1280,11 @@ def append(self, other):`
`1280`	`1280`	`"""Append a second model to the present model.`
`1281`	`1281`
`1282`	`1282`	`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.`
`1284`	`1284`
`1285`	`1285`	`Parameters`
`1286`	`1286`	`----------`
`1287`		- other : `StateSpace`
	`1287`	+ other : `StateSpace` or `TransferFunction`
`1288`	`1288`	`System to be appended.`
`1289`	`1289`
`1290`	`1290`	`Returns`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,19 @@ def append(self, other):`
`899`	`899`	`"""Append a second model to the present model.`
`900`	`900`
`901`	`901`	`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`	`+ """`
`903`	`915`	`other=_convert_to_transfer_function(other)`
`904`	`916`
`905`	`917`	`new_tf=bdalg.combine_tf([`

Comments

(0)