@@ -16,6 +16,7 @@
|
16 | 16 | "metadata": {}, |
17 | 17 | "outputs": [], |
18 | 18 | "source": [ |
| 19 | +"import numpy as np\n", |
19 | 20 | "import scipy as sp\n", |
20 | 21 | "import matplotlib.pyplot as plt\n", |
21 | 22 | "import control as ct" |
|
109 | 110 | "w001rad = 1. # 1 rad/s\n", |
110 | 111 | "w010rad = 10. # 10 rad/s\n", |
111 | 112 | "w100rad = 100. # 100 rad/s\n", |
112 | | -"w001hz = 2*sp.pi*1. # 1 Hz\n", |
113 | | -"w010hz = 2*sp.pi*10. # 10 Hz\n", |
114 | | -"w100hz = 2*sp.pi*100. # 100 Hz\n", |
| 113 | +"w001hz = 2*np.pi*1. # 1 Hz\n", |
| 114 | +"w010hz = 2*np.pi*10. # 10 Hz\n", |
| 115 | +"w100hz = 2*np.pi*100. # 100 Hz\n", |
115 | 116 | "# First order systems\n", |
116 | 117 | "pt1_w001rad = ct.tf([1.], [1./w001rad, 1.], name='pt1_w001rad')\n", |
117 | 118 | "display(pt1_w001rad)\n", |
|
153 | 154 | ], |
154 | 155 | "source": [ |
155 | 156 | "sampleTime = 0.001\n", |
156 | | -"display('Nyquist frequency: {:.0f} Hz, {:.0f} rad/sec'.format(1./sampleTime /2., 2*sp.pi*1./sampleTime /2.))" |
| 157 | +"display('Nyquist frequency: {:.0f} Hz, {:.0f} rad/sec'.format(1./sampleTime /2., 2*np.pi*1./sampleTime /2.))" |
157 | 158 | ] |
158 | 159 | }, |
159 | 160 | { |
|