Skip to content

Commit 98a71b1

Browse files
committed
A5 update
1 parent 92bdbaf commit 98a71b1

8 files changed

Lines changed: 142 additions & 196 deletions

File tree

1_Dynamics/5_Complex_system_dynamics/Simulation of arbitrary transfer functions.ipynb

Lines changed: 18 additions & 18 deletions
Large diffs are not rendered by default.

1_Dynamics/6_Multivariable_system_representation/State space.ipynb

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@
200200
"name": "stderr",
201201
"output_type": "stream",
202202
"text": [
203-
"/Users/alchemyst/anaconda3/lib/python3.7/site-packages/scipy/signal/filter_design.py:1619: BadCoefficients: Badly conditioned filter coefficients (numerator): the results may be meaningless\n",
204-
" \"results may be meaningless\", BadCoefficients)\n"
203+
"C:\\Users\\Admin\\anaconda3\\lib\\site-packages\\scipy\\signal\\filter_design.py:1630: BadCoefficients: Badly conditioned filter coefficients (numerator): the results may be meaningless\n",
204+
" warnings.warn(\"Badly conditioned filter coefficients (numerator): the \"\n"
205205
]
206206
}
207207
],
@@ -271,7 +271,7 @@
271271
{
272272
"data": {
273273
"text/plain": [
274-
"(array([[0, 1]]), array([1., 1.]))"
274+
"(array([[0., 1.]]), array([1., 1.]))"
275275
]
276276
},
277277
"execution_count": 12,
@@ -312,10 +312,7 @@
312312
"$$\\frac{1}{s + 1}$$"
313313
],
314314
"text/plain": [
315-
"\n",
316-
" 1\n",
317-
"-----\n",
318-
"s + 1"
315+
"TransferFunction(array([1]), array([1, 1]))"
319316
]
320317
},
321318
"execution_count": 14,
@@ -342,14 +339,18 @@
342339
"outputs": [
343340
{
344341
"data": {
342+
"text/latex": [
343+
"\\[\n",
344+
"\\left(\n",
345+
"\\begin{array}{rll|rll}\n",
346+
"-1\\phantom{.}&\\hspace{-1em}&\\hspace{-1em}\\phantom{\\cdot}&1\\phantom{.}&\\hspace{-1em}&\\hspace{-1em}\\phantom{\\cdot}\\\\\n",
347+
"\\hline\n",
348+
"1\\phantom{.}&\\hspace{-1em}&\\hspace{-1em}\\phantom{\\cdot}&0\\phantom{.}&\\hspace{-1em}&\\hspace{-1em}\\phantom{\\cdot}\\\\\n",
349+
"\\end{array}\\right)\n",
350+
"\\]"
351+
],
345352
"text/plain": [
346-
"A = [[-1.]]\n",
347-
"\n",
348-
"B = [[1.]]\n",
349-
"\n",
350-
"C = [[1.]]\n",
351-
"\n",
352-
"D = [[0.]]"
353+
"StateSpace(array([[-1.]]), array([[1.]]), array([[1.]]), array([[0.]]))"
353354
]
354355
},
355356
"execution_count": 15,
@@ -370,7 +371,7 @@
370371
{
371372
"data": {
372373
"text/plain": [
373-
"matrix([[-1.]])"
374+
"array([[-1.]])"
374375
]
375376
},
376377
"execution_count": 16,
@@ -575,7 +576,7 @@
575576
{
576577
"data": {
577578
"text/plain": [
578-
"(array([-1.]), matrix([[1.]]))"
579+
"(array([-1.]), array([[1.]]))"
579580
]
580581
},
581582
"execution_count": 26,
@@ -604,7 +605,7 @@
604605
"name": "python",
605606
"nbconvert_exporter": "python",
606607
"pygments_lexer": "ipython3",
607-
"version": "3.7.3"
608+
"version": "3.8.8"
608609
}
609610
},
610611
"nbformat": 4,

1_Dynamics/6_Multivariable_system_representation/Transfer function matrices.ipynb

Lines changed: 39 additions & 52 deletions
Large diffs are not rendered by default.

1_Dynamics/9_Sampled_systems/The z domain and continuous systems.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
"name": "python",
475475
"nbconvert_exporter": "python",
476476
"pygments_lexer": "ipython3",
477-
"version": "3.7.3"
477+
"version": "3.8.8"
478478
}
479479
},
480480
"nbformat": 4,

1_Dynamics/9_Sampled_systems/The z transform.ipynb

Lines changed: 26 additions & 72 deletions
Large diffs are not rendered by default.

2_Control/7_Multivariable_control/Multivariable closed loop transfer functions.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
"name": "python",
306306
"nbconvert_exporter": "python",
307307
"pygments_lexer": "ipython3",
308-
"version": "3.7.3"
308+
"version": "3.8.8"
309309
}
310310
},
311311
"nbformat": 4,

Simulation/Timing study.ipynb

Lines changed: 38 additions & 34 deletions
Large diffs are not rendered by default.

TOC.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
"name": "python",
306306
"nbconvert_exporter": "python",
307307
"pygments_lexer": "ipython3",
308-
"version": "3.7.6"
308+
"version": "3.8.8"
309309
}
310310
},
311311
"nbformat": 4,

0 commit comments

Comments
 (0)