Skip to content

Reimplementation of 2D phase plots #980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 31, 2024
Merged

Reimplementation of 2D phase plots #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ca12ff
initial reimplementation of phase plots
murrayrm Mar 21, 2024
c41d472
address @sliivingston, @sawyerbfuller comments
murrayrm Mar 30, 2024
edb444e
small updates to address @sawyerbfuller comments on updfcn
murrayrm Mar 30, 2024
748e36a
fix typos + other small fixes from @slivingston
murrayrm Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions control/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
* :mod:`~control.flatsys`: Differentially flat systems
* :mod:`~control.matlab`: MATLAB compatibility module
* :mod:`~control.optimal`: Optimization-based control
* :mod:`~control.phaseplot`: 2D phase plane diagrams

"""

Expand Down Expand Up @@ -103,6 +104,10 @@
from .passivity import *
from .sysnorm import *

# Allow access to phase_plane functions as ct.phaseplot.fcn or ct.pp.fcn
from . import phaseplot
from . import phaseplot as pp

# Exceptions
from .exception import *

Expand Down
3 changes: 3 additions & 0 deletions control/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ def reset_defaults():
from .timeplot import _timeplot_defaults
defaults.update(_timeplot_defaults)

from .phaseplot import _phaseplot_defaults
defaults.update(_phaseplot_defaults)


def _get_param(module, param, argval=None, defval=None, pop=False, last=False):
"""Return the default value for a configuration option.
Expand Down
6 changes: 4 additions & 2 deletions control/flatsys/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@
# Author: Richard M. Murray
# Date: 1 Jul 2019

r"""The :mod:`control.flatsys` package contains a set of classes and functions
that can be used to compute trajectories for differentially flat systems.
r"""Differentially flat systems sub-package.

The :mod:`control.flatsys` sub-package contains a set of classes and
functions to compute trajectories for differentially flat systems.

A differentially flat system is defined by creating an object using the
:class:`~control.flatsys.FlatSystem` class, which has member functions for
Expand Down
2 changes: 1 addition & 1 deletion control/freqplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ def gen_zero_centered_series(val_min, val_max, period):
_nyquist_defaults = {
'nyquist.primary_style': ['-', '-.'], # style for primary curve
'nyquist.mirror_style': ['--', ':'], # style for mirror curve
'nyquist.arrows': 2, # number of arrors around curve
'nyquist.arrows': 2, # number of arrows around curve
'nyquist.arrow_size': 8, # pixel size for arrows
'nyquist.encirclement_threshold': 0.05, # warning threshold
'nyquist.indent_radius': 1e-4, # indentation radius
Expand Down
Loading
Loading