Skip to content

Commit 8983e39

Browse files
authored
Merge pull request #980 from murrayrm/phaseplots_01Jan2024
Reimplementation of 2D phase plots
2 parents 62d88c9 + 748e36a commit 8983e39

19 files changed

+1553
-319
lines changed

control/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
* :mod:`~control.flatsys`: Differentially flat systems
6464
* :mod:`~control.matlab`: MATLAB compatibility module
6565
* :mod:`~control.optimal`: Optimization-based control
66+
* :mod:`~control.phaseplot`: 2D phase plane diagrams
6667
6768
"""
6869

@@ -103,6 +104,10 @@
103104
from .passivity import *
104105
from .sysnorm import *
105106

107+
# Allow access to phase_plane functions as ct.phaseplot.fcn or ct.pp.fcn
108+
from . import phaseplot
109+
from . import phaseplot as pp
110+
106111
# Exceptions
107112
from .exception import *
108113

control/config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ def reset_defaults():
152152
from .timeplot import _timeplot_defaults
153153
defaults.update(_timeplot_defaults)
154154

155+
from .phaseplot import _phaseplot_defaults
156+
defaults.update(_phaseplot_defaults)
157+
155158

156159
def _get_param(module, param, argval=None, defval=None, pop=False, last=False):
157160
"""Return the default value for a configuration option.

control/flatsys/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
# Author: Richard M. Murray
3636
# Date: 1 Jul 2019
3737

38-
r"""The :mod:`control.flatsys` package contains a set of classes and functions
39-
that can be used to compute trajectories for differentially flat systems.
38+
r"""Differentially flat systems sub-package.
39+
40+
The :mod:`control.flatsys` sub-package contains a set of classes and
41+
functions to compute trajectories for differentially flat systems.
4042
4143
A differentially flat system is defined by creating an object using the
4244
:class:`~control.flatsys.FlatSystem` class, which has member functions for

control/freqplot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ def gen_zero_centered_series(val_min, val_max, period):
10701070
_nyquist_defaults = {
10711071
'nyquist.primary_style': ['-', '-.'], # style for primary curve
10721072
'nyquist.mirror_style': ['--', ':'], # style for mirror curve
1073-
'nyquist.arrows': 2, # number of arrors around curve
1073+
'nyquist.arrows': 2, # number of arrows around curve
10741074
'nyquist.arrow_size': 8, # pixel size for arrows
10751075
'nyquist.encirclement_threshold': 0.05, # warning threshold
10761076
'nyquist.indent_radius': 1e-4, # indentation radius

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy