Skip to content

Commit cd675aa

Browse files
committed
update CDS 110, L4a and L4b
1 parent 557f2c2 commit cd675aa

3 files changed

Lines changed: 446 additions & 80 deletions

File tree

‎control/freqplot.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ def bode_plot(
147147
figure with the correct number and shape of axes, a new figure is
148148
created. The shape of the array must match the shape of the
149149
plotted data.
150+
freq_label: str, optional
151+
Frequency label (defaults to "rad/sec" or "Hertz")
150152
grid : bool, optional
151153
If True, plot grid lines on gain and phase plots. Default is set by
152154
`config.defaults['freqplot.grid']`.
@@ -168,6 +170,8 @@ def bode_plot(
168170
legend_loc : int or str, optional
169171
Include a legend in the given location. Default is 'center right',
170172
with no legend for a single response. Use False to suppress legend.
173+
magnitude_label : str, optional
174+
Label to use for magnitude axis. Defaults to "Magnitude".
171175
margins_method : str, optional
172176
Method to use in computing margins (see :func:`stability_margins`).
173177
omega_limits : array_like of two values
@@ -179,6 +183,8 @@ def bode_plot(
179183
Number of samples to use for the frequeny range. Defaults to
180184
config.defaults['freqplot.number_of_samples']. Ignored if data is
181185
not a list of systems.
186+
phase_label : str, optional
187+
Label to use for magnitude axis. Defaults to "Phase [rad]".
182188
plot : bool, optional
183189
(legacy) If given, `bode_plot` returns the legacy return values
184190
of magnitude, phase, and frequency. If False, just return the

‎examples/cds110-L4a_predprey-statefbk.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@
318318
"cell_type": "markdown",
319319
"metadata": {},
320320
"source": [
321-
"We see that the controller no longer stabilizes the equilibrium point (shown with the asked lines). In particular, the steady state value of the Lynx population does to almost twice the original value.\n",
321+
"We see that the controller no longer stabilizes the equilibrium point (shown with the dashed lines). In particular, the steady state value of the Lynx population does to almost twice the original value.\n",
322322
"\n",
323323
"This effect is even worse if we increase $r$ just a bit more (from 1.65 to 1.7)."
324324
]
@@ -347,7 +347,7 @@
347347
"cell_type": "markdown",
348348
"metadata": {},
349349
"source": [
350-
"The system dynamics are now oscillator, indicating that we are no longer stabilizing the desired equilibrium point. This indicates a lack of robustness in our feedback control system.\n",
350+
"The system dynamics are now oscillatory, indicating that we are no longer stabilizing the desired equilibrium point. This indicates a lack of robustness in our feedback control system.\n",
351351
"\n",
352352
"We can compensate for the change in the parameter $r$ by making use of integral feedback in our controller. We will learn more about integral feedback in later lectures, but for now we demonstrate its ability to compensate for errors in our system model."
353353
]

0 commit comments

Comments
 (0)