[python-control-discuss] SF.net python-control commit:[295] trunk

[<mur...@us...>]

Revision: 295
          http://sourceforge.net/p/python-control/code/295
Author:   murrayrm
Date:     2014-03-22 18:30:41 +0000 (Sat, 22 Mar 2014)
Log Message:
-----------
allow FRD for feedback()

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/bdalg.py

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2014-03-22 18:09:48 UTC (rev 294)
+++ trunk/ChangeLog	2014-03-22 18:30:41 UTC (rev 295)
@@ -1,5 +1,9 @@
 2014-03-22  Richard Murray  <murray@sidamo.local>
 
+	* src/bdalg.py (feedback): allow FRD for feedback()
+
+2014-03-22  Richard Murray  <murray@sidamo.local>
+
 	* tests/discrete_test.py (TestDiscrete.test_sample_system): added
 	conversions using tustin and zoh to catch 'dt' bug #5
 

Modified: trunk/src/bdalg.py
===================================================================
--- trunk/src/bdalg.py	2014-03-22 18:09:48 UTC (rev 294)
+++ trunk/src/bdalg.py	2014-03-22 18:30:41 UTC (rev 295)
@@ -220,13 +220,13 @@
 
     # Check for correct input types.
     if not isinstance(sys1, (int, float, complex, tf.TransferFunction,
-                             ss.StateSpace)):
-        raise TypeError("sys1 must be a TransferFunction or StateSpace " +
-                        "object, or a scalar.")
+                             ss.StateSpace, frd.FRD)):
+        raise TypeError("sys1 must be a TransferFunction, StateSpace " +
+                        "or FRD object, or a scalar.")
     if not isinstance(sys2, (int, float, complex, tf.TransferFunction,
-                             ss.StateSpace)):
-        raise TypeError("sys2 must be a TransferFunction or StateSpace " + 
-                        "object, or a scalar.")
+                             ss.StateSpace, frd.FRD)):
+        raise TypeError("sys2 must be a TransferFunction, StateSpace " + 
+                        "or FRD object, or a scalar.")
 
     # If sys1 is a scalar, convert it to the appropriate LTI type so that we can
     # its feedback member function.