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

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

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

Log Message:
-----------
Moved rss, drss to matlab.py.

Changes made in {matlab,statesp,TestStateSp}.py as necessary.

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

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

Modified: branches/control-0.4a/src/TestStateSp.py
===================================================================
--- branches/control-0.4a/src/TestStateSp.py	2011-02-08 22:13:26 UTC (rev 45)
+++ branches/control-0.4a/src/TestStateSp.py	2011-02-08 22:13:30 UTC (rev 46)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import numpy as np
-import statesp as ss
+import matlab
 import unittest
 
 class TestRss(unittest.TestCase):
@@ -22,7 +22,7 @@
         for states in range(1, self.maxStates):
             for inputs in range(1, self.maxIO):
                 for outputs in range(1, self.maxIO):
-                    sys = ss.rss(states, inputs, outputs)
+                    sys = matlab.rss(states, inputs, outputs)
                     self.assertEqual(sys.states, states)
                     self.assertEqual(sys.inputs, inputs)
                     self.assertEqual(sys.outputs, outputs)
@@ -33,7 +33,7 @@
         for states in range(1, self.maxStates):
             for inputs in range(1, self.maxIO):
                 for outputs in range(1, self.maxIO):
-                    sys = ss.rss(states, inputs, outputs)
+                    sys = matlab.rss(states, inputs, outputs)
                     p = sys.poles()
                     for z in p:
                         self.assertTrue(z.real < 0)
@@ -56,7 +56,7 @@
         for states in range(1, self.maxStates):
             for inputs in range(1, self.maxIO):
                 for outputs in range(1, self.maxIO):
-                    sys = ss.drss(states, inputs, outputs)
+                    sys = matlab.drss(states, inputs, outputs)
                     self.assertEqual(sys.states, states)
                     self.assertEqual(sys.inputs, inputs)
                     self.assertEqual(sys.outputs, outputs)
@@ -67,7 +67,7 @@
         for states in range(1, self.maxStates):
             for inputs in range(1, self.maxIO):
                 for outputs in range(1, self.maxIO):
-                    sys = ss.drss(states, inputs, outputs)
+                    sys = matlab.drss(states, inputs, outputs)
                     p = sys.poles()
                     for z in p:
                         self.assertTrue(abs(z) < 1)

Modified: branches/control-0.4a/src/matlab.py
===================================================================
--- branches/control-0.4a/src/matlab.py	2011-02-08 22:13:26 UTC (rev 45)
+++ branches/control-0.4a/src/matlab.py	2011-02-08 22:13:30 UTC (rev 46)
@@ -60,7 +60,7 @@
 # Control system library
 import ctrlutil
 import freqplot
-from statesp import StateSpace
+from statesp import StateSpace, rss_generate
 from xferfcn import TransferFunction
 from exception import *
 
@@ -187,8 +187,8 @@
    augstate       - augment output by appending states
  
 State-space (SS) models
-   rss            - random stable continuous-time state-space models
-   drss           - random stable discrete-time state-space models
+*  rss            - random stable continuous-time state-space models
+*  drss           - random stable discrete-time state-space models
    ss2ss          - state coordinate transformation
    canon          - canonical forms of state-space models
 *  ctrb           - controllability matrix
@@ -306,6 +306,16 @@
     else:
         raise ValueError, "Needs 1 or 2 arguments."
 
+def rss(states=1, inputs=1, outputs=1):
+    """Create a stable continuous random state space object."""
+    
+    return rss_generate(states, inputs, outputs, 'c')
+    
+def drss(states=1, inputs=1, outputs=1):
+    """Create a stable discrete random state space object."""
+    
+    return rss_generate(states, inputs, outputs, 'd')
+    
 # Frequency response is handled by the system object
 def freqresp(H, omega): 
     """Return the frequency response for an object H at frequency omega"""

Modified: branches/control-0.4a/src/statesp.py
===================================================================
--- branches/control-0.4a/src/statesp.py	2011-02-08 22:13:26 UTC (rev 45)
+++ branches/control-0.4a/src/statesp.py	2011-02-08 22:13:30 UTC (rev 46)
@@ -295,17 +295,7 @@
 
     else:
         raise TypeError("can't convert given type to StateSpace system")
-
-def rss(states=1, inputs=1, outputs=1):
-    """Create a stable continuous random state space object."""
     
-    return rss_generate(states, inputs, outputs, 'c')
-    
-def drss(states=1, inputs=1, outputs=1):
-    """Create a stable discrete random state space object."""
-    
-    return rss_generate(states, inputs, outputs, 'd')
-    
 def rss_generate(states, inputs, outputs, type):
     """This does the actual random state space generation expected from rss and
     drss.  type is 'c' for continuous systems and 'd' for discrete systems."""


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