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

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

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

Log Message:
-----------
Merge of revisions 72 to 74.

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

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

Modified: branches/control-0.4a/src/matlab.py
===================================================================
--- branches/control-0.4a/src/matlab.py	2011-02-08 22:15:51 UTC (rev 75)
+++ branches/control-0.4a/src/matlab.py	2011-02-08 22:15:55 UTC (rev 76)
@@ -595,6 +595,10 @@
       yout      response of the system
       xout      time evolution of the state vector
     """
+    sys = args[0]
+    ltiobjs = sys.returnScipySignalLti()
+    ltiobj = ltiobjs[0][0]
+ 
     return sp.signal.lsim2(*args, **keywords)
 
 #! Redefine step to use lsim2 
@@ -615,8 +619,19 @@
       T         time values of the output
       yout      response of the system
     """
-    return sp.signal.step(*args, **keywords)
+    sys = args[0]
+    ltiobjs = sys.returnScipySignalLti()
+    ltiobj = ltiobjs[0][0]
+    newargs = []
+    newargs.append(ltiobj)
+    for i in range(1, len(args)):
+        newargs.append(args[i])
+    newargs = tuple(newargs)
+    print len(args)
+    print len(newargs)    
 
+    return sp.signal.step(*newargs, **keywords)
+
 # Redefine initial to use lsim2
 #! Not yet implemented (uses step for now)
 def initial(*args, **keywords):
@@ -635,6 +650,10 @@
       T         time values of the output
       yout      response of the system
     """
+    sys = args[0]
+    ltiobjs = sys.returnScipySignalLti()
+    ltiobj = ltiobjs[0][0]
+
     return sp.signal.initial(*args, **keywords)
 
 # Redefine impulse to use initial()
@@ -655,5 +674,9 @@
       T         time values of the output
       yout      response of the system
     """
-    return sp.signal.impulse(*args, **keywords)
+    sys = args[0]
+    ltiobjs = sys.returnScipySignalLti()
+    ltiobj = ltiobjs[0][0]
 
+    return sp.signal.impulse(ltiobj, **keywords)
+


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