8000 test more asymptotic step_info · python-control/python-control@a0a570a · GitHub
[go: up one dir, main page]

Skip to content

Commit a0a570a

Browse files
committed
test more asymptotic step_info
1 parent 8b900ca commit a0a570a

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

control/tests/timeresp_test.py

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,23 @@ def siso_tf_kneg(self):
243243
'SteadyStateValue': -1.0}
244244
return T
245245

246+
@pytest.fixture
247+
def siso_tf_asymptotic_from_neg1(self):
248+
# Peak_value = Undershoot = y_final(y(t=inf))
249+
T = TSys(TransferFunction([-1, 1], [1, 1]))
250+
T.step_info = {
251+
'RiseTime': 2.197,
252+
'SettlingTime': 4.605,
253+
'SettlingMin': 0.9,
254+
'SettlingMax': 1.0,
255+
'Overshoot': 0,
256+
'Undershoot': 100.0,
257+
'Peak': 1.0,
258+
'PeakTime': 0.0,
259+
'SteadyStateValue': 1.0}
260+
T.kwargs = {'T': np.arange(0, 5, 1e-3)}
261+
return T
262+
246263
@pytest.fixture
247264
def siso_tf_step_matlab(self):
248265
# example from matlab online help
@@ -348,7 +365,8 @@ def tsystem(self,
348365
pole_cancellation, no_pole_cancellation, siso_tf_type1,
349366
siso_tf_kpos, siso_tf_kneg,
350367
siso_tf_step_matlab, siso_ss_step_matlab,
351-
mimo_ss_step_matlab, mimo_tf_step_info):
368+
mimo_ss_step_matlab, mimo_tf_step_info,
369+
siso_tf_asymptotic_from_neg1):
352370
systems = {"siso_ss1": siso_ss1,
353371
"siso_ss2": siso_ss2,
354372
"siso_tf1": siso_tf1,
@@ -373,6 +391,7 @@ def tsystem(self,
373391
"siso_ss_step_matlab": siso_ss_step_matlab,
374392
"mimo_ss_step_matlab": mimo_ss_step_matlab,
375393
"mimo_tf_step": mimo_tf_step_info,
394+
"siso_tf_asymptotic_from_neg1": siso_tf_asymptotic_from_neg1,
376395
}
377396
return systems[request.param]
378397

@@ -466,7 +485,8 @@ def assert_step_info_match(self, sys, info, info_ref):
466485
"siso_ss_step_matlab",
467486
"siso_tf_kpos",
468487
"siso_tf_kneg",
469-
"siso_tf_type1"],
488+
"siso_tf_type1",
489+
"siso_tf_asymptotic_from_neg1"],
470490
indirect=["tsystem"])
471491
def test_step_info(self, tsystem, systype, time_2d, yfinal):
472492
"""Test step info for SISO systems."""

0 commit comments

Comments
 (0)
0