|
From: <mur...@us...> - 2012-01-08 02:57:52
|
Revision: 180
http://python-control.svn.sourceforge.net/python-control/?rev=180&view=rev
Author: murrayrm
Date: 2012-01-08 02:57:46 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
small updates to documetnation + keywords property
Modified Paths:
--------------
trunk/src/bdalg.py
trunk/src/margins.py
Property Changed:
----------------
trunk/src/margins.py
Modified: trunk/src/bdalg.py
===================================================================
--- trunk/src/bdalg.py 2012-01-08 02:56:24 UTC (rev 179)
+++ trunk/src/bdalg.py 2012-01-08 02:57:46 UTC (rev 180)
@@ -59,7 +59,7 @@
"""Return the series connection sys2 * sys1 for --> sys1 --> sys2 -->.
Parameters
- ---------
+ ----------
sys1: scalar, StateSpace, or TransferFunction
sys2: scalar, StateSpace, or TransferFunction
@@ -96,7 +96,7 @@
Return the parallel connection sys1 + sys2.
Parameters
- ---------
+ ----------
sys1: scalar, StateSpace, or TransferFunction
sys2: scalar, StateSpace, or TransferFunction
@@ -121,7 +121,7 @@
`sys1` is a scalar, then the output type is the type of `sys2`.
Examples
- -------
+ --------
>>> sys3 = parallel(sys1, sys2) # Same as sys3 = sys1 + sys2.
"""
Modified: trunk/src/margins.py
===================================================================
--- trunk/src/margins.py 2012-01-08 02:56:24 UTC (rev 179)
+++ trunk/src/margins.py 2012-01-08 02:57:46 UTC (rev 180)
@@ -43,7 +43,7 @@
Author: Richard M. Murray
Date: 14 July 2011
-$Id: xferfcn.py 165 2011-06-26 02:44:09Z murrayrm $
+$Id$
"""
@@ -58,8 +58,8 @@
"""Calculate gain, phase and stability margins and associated
crossover frequencies.
- Usage:
-
+ Usage
+ -----
gm, pm, sm, wg, wp, ws = stability_margins(sysdata, deg=True)
Parameters
Property changes on: trunk/src/margins.py
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|