Merge branch 'patch-1' of https://github.com/Marxlp/python-control into Marxlp-patch-1

murrayrm · murrayrm · commit 2bb70cf9b3f8 · 2018-01-02T21:22:27.000-08:00
diff --git a/control/bdalg.py b/control/bdalg.py
@@ -61,14 +61,16 @@
 
 __all__ = ['series', 'parallel', 'negate', 'feedback', 'append', 'connect']
 
-def series(sys1, sys2):
-    """Return the series connection sys2 * sys1 for --> sys1 --> sys2 -->.
+def series(sys1, sys2,*sysn):
+    """Return the series connection (... * sys3 *) sys2 * sys1 
+    for (... sys3 -->) sys1 --> sys2 -->.
 
     Parameters
     ----------
     sys1: scalar, StateSpace, TransferFunction, or FRD
     sys2: scalar, StateSpace, TransferFunction, or FRD
-
+    sysn: scalar, StateSpace, TransferFunction, or FRD
+    
     Returns
     -------
     out: scalar, StateSpace, or TransferFunction
@@ -98,20 +100,28 @@ def series(sys1, sys2):
     Examples
     --------
     >>> sys3 = series(sys1, sys2) # Same as sys3 = sys2 * sys1.
+    >>> sys_final = series(sys1, sys2, sys3, sys4)
 
     """
-
-    return sys2 * sys1
-
-def parallel(sys1, sys2):
+      
+    if len(sysn) == 0:
+      return sys2 * sys1
+    else:
+      sys_final = sys2 * sys1
+      for sys in sysn:
+         sys_final = sys * sys_final
+      return sys_final
+
+def parallel(sys1, sys2, *sysn):
     """
-    Return the parallel connection sys1 + sys2.
+    Return the parallel connection sys1 + sys2 (+ sys3 +... ).
 
     Parameters
     ----------
     sys1: scalar, StateSpace, TransferFunction, or FRD
     sys2: scalar, StateSpace, TransferFunction, or FRD
-
+    sysn: scalar, StateSpace, TransferFunction, or FRD
+    
     Returns
     -------
     out: scalar, StateSpace, or TransferFunction
@@ -141,10 +151,16 @@ def parallel(sys1, sys2):
     Examples
     --------
     >>> sys3 = parallel(sys1, sys2) # Same as sys3 = sys1 + sys2.
-
+    >>> sys_final = parallel(sys1, sys2, sys3, sys4)
+    
     """
-
-    return sys1 + sys2
+    if len(sysn) == 0:
+      return sys1 + sys2
+    else:
+      sys_final = sys1 + sys2
+      for sys in sysn:
+         sys_final = sys_final + sys
+      return sys_final
 
 def negate(sys):
     """
