[python-control-discuss] SF.net SVN: python-control:[71] branches/control-0.4a/src

[<kk...@us...>]

Revision: 71
          http://python-control.svn.sourceforge.net/python-control/?rev=71&view=rev
Author:   kkchen
Date:     2011-02-08 22:15:32 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
Renamed Lti2 to Lti.

Kevin K. Chen <kk...@pr...>

Modified Paths:
--------------
    branches/control-0.4a/src/statesp.py
    branches/control-0.4a/src/xferfcn.py

Added Paths:
-----------
    branches/control-0.4a/src/lti.py

Removed Paths:
-------------
    branches/control-0.4a/src/lti2.py

Added: branches/control-0.4a/src/lti.py
===================================================================
--- branches/control-0.4a/src/lti.py	                        (rev 0)
+++ branches/control-0.4a/src/lti.py	2011-02-08 22:15:32 UTC (rev 71)
@@ -0,0 +1,9 @@
+class Lti:
+    """The Lti is a parent class to the StateSpace and TransferFunction child
+    classes.  It only contains the number of inputs and outputs, but this can be
+    expanded in the future."""
+    
+    def __init__(self, inputs=1, outputs=1):
+        # Data members common to StateSpace and TransferFunction.
+        self.inputs = inputs
+        self.outputs = outputs

Deleted: branches/control-0.4a/src/lti2.py
===================================================================
--- branches/control-0.4a/src/lti2.py	2011-02-08 22:15:26 UTC (rev 70)
+++ branches/control-0.4a/src/lti2.py	2011-02-08 22:15:32 UTC (rev 71)
@@ -1,9 +0,0 @@
-class Lti2:
-    """The Lti2 is a parent class to the StateSpace and TransferFunction child
-    classes.  It only contains the number of inputs and outputs, but this can be
-    expanded in the future."""
-    
-    def __init__(self, inputs=1, outputs=1):
-        # Data members common to StateSpace and TransferFunction.
-        self.inputs = inputs
-        self.outputs = outputs
\ No newline at end of file

Modified: branches/control-0.4a/src/statesp.py
===================================================================
--- branches/control-0.4a/src/statesp.py	2011-02-08 22:15:26 UTC (rev 70)
+++ branches/control-0.4a/src/statesp.py	2011-02-08 22:15:32 UTC (rev 71)
@@ -45,9 +45,9 @@
 from scipy import concatenate, zeros
 from numpy.linalg import solve
 import xferfcn
-from lti2 import Lti2
+from lti import Lti
 
-class StateSpace(Lti2):
+class StateSpace(Lti):
     """The StateSpace class is used throughout the python-control library to
     represent systems in state space form.  This class is derived from the Lti2
     base class."""
@@ -70,7 +70,7 @@
         self.D = D
 
         self.states = A.shape[0]
-        Lti2.__init__(self, B.shape[1], C.shape[0])
+        Lti.__init__(self, B.shape[1], C.shape[0])
         
         # Check that the matrix sizes are consistent.
         if self.states != A.shape[1]:

Modified: branches/control-0.4a/src/xferfcn.py
===================================================================
--- branches/control-0.4a/src/xferfcn.py	2011-02-08 22:15:26 UTC (rev 70)
+++ branches/control-0.4a/src/xferfcn.py	2011-02-08 22:15:32 UTC (rev 71)
@@ -48,9 +48,9 @@
 
 # External function declarations
 import scipy as sp
-from lti2 import Lti2
+from lti import Lti
 
-class TransferFunction(Lti2):
+class TransferFunction(Lti):
     """The TransferFunction class is derived from the Lti2 parent class.  The
     main data members are 'num' and 'den', which are 2-D lists of arrays
     containing MIMO numerator and denominator coefficients.  For example,
@@ -138,7 +138,7 @@
 
         self.num = num
         self.den = den
-        Lti2.__init__(self, inputs, outputs)
+        Lti.__init__(self, inputs, outputs)
         
         self._truncatecoeff()
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.