Update documentaion for Matlab module

cwrowley · cwrowley · commit f48161b90ca4 · 2015-04-26T19:16:07.000-04:00
Matlab module documentation is now in the same format as the main
module, with one routine per html page.
diff --git a/control/matlab/__init__.py b/control/matlab/__init__.py
@@ -92,7 +92,7 @@
 from .timeresp import *
 from .wrappers import *
 
-__doc__ += r"""
+r"""
 The following tables give an overview of the module ``control.matlab``.
 They also show the implementation progress and the planned features of the
 module.
diff --git a/doc/control.rst b/doc/control.rst
@@ -17,6 +17,8 @@ System creation
 
     ss
     tf
+    rss
+    drss
 
 Frequency domain plotting
 =========================
@@ -181,7 +183,6 @@ Utility functions and conversions
     unwrap
     db2mag
     mag2db
-    drss
     isctime
     isdtime
     issys
diff --git a/doc/matlab.rst b/doc/matlab.rst
@@ -1,6 +1,147 @@
 .. _matlab-module:
 
-MATLAB compatibility module
-===========================
+=============================
+ MATLAB compatibility module
+=============================
 
 .. automodule:: control.matlab
+   :no-members:
+   :no-inherited-members:
+
+.. currentmodule:: control.matlab
+
+Creating linear models
+======================
+.. autosummary::
+   :toctree: generated/
+
+   tf
+   ss
+   frd
+   rss
+   drss
+
+Utility functions and conversions
+=================================
+.. autosummary::
+   :toctree: generated/
+
+   mag2db
+   db2mag
+   c2d
+   ss2tf
+   tf2ss
+   tfdata
+
+System interconnections
+=======================
+.. autosummary::
+   :toctree: generated/
+
+   series
+   parallel
+   feedback
+   negate
+   connect
+   append
+
+System gain and dynamics
+========================
+.. autosummary::
+   :toctree: generated/
+
+   dcgain
+   pole
+   zero
+   damp
+   pzmap
+
+Time-domain analysis
+====================
+.. autosummary::
+   :toctree: generated/
+
+   step
+   impulse
+   initial
+   lsim
+
+Frequency-domain analysis
+=========================
+.. autosummary::
+   :toctree: generated/
+
+   bode
+   nyquist
+   nichols
+   margin
+   freqresp
+   evalfr
+
+Compensator design
+==================
+.. autosummary::
+   :toctree: generated/
+
+   rlocus
+   place
+   lqr
+
+State-space (SS) models
+=======================
+.. autosummary::
+   :toctree: generated/
+
+   rss
+   drss
+   ctrb
+   obsv
+   gram
+
+Model simplification
+====================
+.. autosummary::
+   :toctree: generated/
+
+   minreal
+   hsvd
+   balred
+   modred
+   era
+   markov
+
+Time delays
+===========
+.. autosummary::
+   :toctree: generated/
+
+   pade
+
+Matrix equation solvers and linear algebra
+==========================================
+.. autosummary::
+   :toctree: generated/
+
+   lyap
+   dlyap
+   care
+   dare
+
+Additional functions
+====================
+.. autosummary::
+   :toctree: generated/
+
+   gangof4
+   unwrap
+
+Functions imported from other modules
+=====================================
+.. autosummary::
+
+   ~numpy.linspace
+   ~numpy.logspace
+   ~scipy.signal.ss2zpk
+   ~scipy.signal.tf2zpk
+   ~scipy.signal.zpk2ss
+   ~scipy.signal.zpk2tf
