GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,9 +43,10 @@ def reset_defaults():
		# System level defaults
		defaults.update(_control_defaults)

		from .freqplot import _bode_defaults, _freqplot_defaults
		from .freqplot import _bode_defaults, _freqplot_defaults, _nyquist_defaults
		defaults.update(_bode_defaults)
		defaults.update(_freqplot_defaults)
		defaults.update(_nyquist_defaults)

		from .nichols import _nichols_defaults
		defaults.update(_nichols_defaults)
Expand Down Expand Up		@@ -138,9 +139,11 @@ def use_fbs_defaults():
		The following conventions are used:
		* Bode plots plot gain in powers of ten, phase in degrees,
		frequency in rad/sec, no grid
		* Nyquist plots use dashed lines for mirror image of Nyquist curve

		"""
		set_defaults('bode', dB=False, deg=True, Hz=False, grid=False)
		set_defaults('nyquist', mirror_style='--')


		# Decide whether to use numpy.matrix for state space operations
Expand Down Expand Up		@@ -239,4 +242,7 @@ def use_legacy_defaults(version):
		# time responses are only squeezed if SISO
		set_defaults('control', squeeze_time_response=True)

		# switched mirror_style of nyquist from '-' to '--'
		set_defaults('nyqist', mirror_style='-')

		return (major, minor, patch)

5 changes: 3 additions & 2 deletions 5 control/descfcn.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -241,8 +241,9 @@ def describing_function_plot(

		"""
		# Start by drawing a Nyquist curve
		H_real, H_imag, H_omega = nyquist_plot(H, omega, plot=True, **kwargs)
		H_vals = H_real + 1j * H_imag
		count, contour = nyquist_plot(
		H, omega, plot=True, return_contour=True, **kwargs)
		H_omega, H_vals = contour.imag, H(contour)

		# Compute the describing function
		df = describing_function(F, A)
Expand Down

Oops, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.