Merge branch 'modelsimp_full_name' of https://github.com/KybernetikJo… · python-control/python-control@88a21d2
@@ -49,15 +49,17 @@
4949from .statefbk import gram
5050from .timeresp import TimeResponseData
515152-__all__ = ['hsvd', 'balred', 'modred', 'eigensys_realization', 'markov', 'minreal', 'era']
52+__all__ = ['hankel_singular_values', 'balanced_reduction', 'model_reduction',
53+'minimal_realization', 'eigensys_realization', 'markov', 'hsvd',
54+'balred', 'modred', 'minreal', 'era']
535554565557# Hankel Singular Value Decomposition
5658#
5759# The following returns the Hankel singular values, which are singular values
5860# of the matrix formed by multiplying the controllability and observability
5961# Gramians
60-def hsvd(sys):
62+def hankel_singular_values(sys):
6163"""Calculate the Hankel singular values.
62646365 Parameters
@@ -106,7 +108,7 @@ def hsvd(sys):
106108return hsv[::-1]
107109108110109-def modred(sys, ELIM, method='matchdc'):
111+def model_reduction(sys, ELIM, method='matchdc'):
110112"""
111113 Model reduction of `sys` by eliminating the states in `ELIM` using a given
112114 method.
@@ -216,7 +218,7 @@ def modred(sys, ELIM, method='matchdc'):
216218return rsys
217219218220219-def balred(sys, orders, method='truncate', alpha=None):
221+def balanced_reduction(sys, orders, method='truncate', alpha=None):
220222"""Balanced reduced order model of sys of a given order.
221223 States are eliminated based on Hankel singular value.
222224 If sys has unstable modes, they are removed, the
@@ -340,7 +342,7 @@ def balred(sys, orders, method='truncate', alpha=None):
340342return rsys
341343342344343-def minreal(sys, tol=None, verbose=True):
345+def minimal_realization(sys, tol=None, verbose=True):
344346'''
345347 Eliminates uncontrollable or unobservable states in state-space
346348 models or cancelling pole-zero pairs in transfer functions. The
@@ -386,8 +388,7 @@ def _block_hankel(Y, m, n):
386388def eigensys_realization(arg, r, m=None, n=None, dt=True, transpose=False):
387389r"""eigensys_realization(YY, r)
388390389- Calculate an ERA model of order `r` based on the impulse-response data
390- `YY`.
391+ Calculate ERA model of order `r` based on impulse-response data `YY`.
391392392393 This function computes a discrete time system
393394@@ -686,4 +687,8 @@ def markov(*args, m=None, transpose=False, dt=None, truncate=False):
686687return H if not transpose else np.transpose(H)
687688688689# Function aliases
690+hsvd = hankel_singular_values
691+balred = balanced_reduction
692+modred = model_reduction
693+minreal = minimal_realization
689694era = eigensys_realization