Fix bug in tests and lti.py.

Mark · Mark · commit f7d74b2a52e4 · 2022-06-16T09:14:24.000-05:00
diff --git a/control/lti.py b/control/lti.py
@@ -205,7 +205,7 @@ def _dcgain(self, warn_infinite):
     def ispassive(self):
         # importing here prevents circular dependancy
         from control.passivity import ispassive
-        ispassive(self)
+        return ispassive(self)
 
     #
     # Deprecated functions
diff --git a/control/tests/passivity_test.py b/control/tests/passivity_test.py
@@ -55,10 +55,10 @@ def test_ispassive_edge_cases(test_input, expected):
 
 
 def test_transfer_function():
-    sys = tf([1], [1, -2])
+    sys = tf([1], [1, 2])
     assert(passivity.ispassive(sys))
 
-    sys = tf([1], [1, 2])
+    sys = tf([1], [1, -2])
     assert(not passivity.ispassive(sys))
 
 
@@ -70,5 +70,5 @@ def test_oo_style():
     sys = ss(A, B, C, D)
     assert(sys.ispassive())
 
-    sys = tf([1], [1, -2])
+    sys = tf([1], [1, 2])
     assert(sys.ispassive())

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ def _dcgain(self, warn_infinite):`
`205`	`205`	`def ispassive(self):`
`206`	`206`	`# importing here prevents circular dependancy`
`207`	`207`	`from control.passivity import ispassive`
`208`		`- ispassive(self)`
	`208`	`+ return ispassive(self)`
`209`	`209`
`210`	`210`	`#`
`211`	`211`	`# Deprecated functions`