|
From: <kk...@us...> - 2011-02-08 22:15:48
|
Revision: 73
http://python-control.svn.sourceforge.net/python-control/?rev=73&view=rev
Author: kkchen
Date: 2011-02-08 22:15:42 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
Added changes to step and impulse from earlier... still needs work with argument list
Steven Brunton <sbr...@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:38 UTC (rev 72)
+++ branches/control-0.4a/src/matlab.py 2011-02-08 22:15:42 UTC (rev 73)
@@ -479,8 +479,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):
@@ -519,5 +530,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.
|