Skip to content

Commit 9ba8972

Browse files
committed
merged frd branch from Rene van Paassen
2 parents 05fea13 + bba73aa commit 9ba8972

9 files changed

Lines changed: 732 additions & 6 deletions

File tree

ChangeLog

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2012-11-02 Richard Murray <murray@altura.local>
2+
3+
* tests/frd_test.py: unit tests for FRD data type
4+
(suite): added suite() function to allow test_all.py to work
5+
6+
* tests/xferfcn_test.py (TestXferFcn.testMinreal): new unit test
7+
8+
* src/xferfcn.py (TransferFunction.minreal): new function for
9+
removing cancelling pole/zero pairs, contributed by M.M. (Rene) van
10+
Paassen
11+
12+
* src/statesp.py (_convertToStateSpace): new functionality for
13+
converting a matrix to a constant system
14+
15+
* src/modelsimp.py (minreal): removed extraneous code (moved to
16+
xferfcn.py)
17+
18+
* src/frdata.py: new file implementing FRD data type, contributed by
19+
M.M. (Rene) van Paassen
20+
21+
* src/xferfcn.py: resolved conflict between versions
22+
123
---- control-0.6b released -----
224

325
2012-11-02 Richard Murray <murray@altura.local>

src/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
tf create a transfer function from num, den coefficients
5050
ss create a state space system from A, B, C, D matrices
5151
pzk create a transfer function from pole, zero, gain
52+
frd create a system description as frequency response
5253
bode generate a Bode plot for a linear I/O system
5354
nyquist generate a Nyquist plot for a linear I/O system
5455
lqr linear quadratic regulator
@@ -75,6 +76,7 @@
7576
impulse_response
7677
from control.xferfcn import TransferFunction
7778
from control.ctrlutil import unwrap, issys
79+
from frdata import FRD
7880

7981
# Import some of the more common (and benign) MATLAB shortcuts
8082
# By default, don't import conflicting commands here

0 commit comments

Comments
 (0)