MAINT: no warning issued for evaluation above the Nyquist frequency

forgi86 · forgi86 · commit 38dfeda5b357 · 2021-04-07T16:19:58.000+02:00
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -1148,9 +1148,6 @@ def singular_values_plot(syslist, omega=None,
                 # limit up to and including nyquist frequency
                 omega_sys = np.hstack((
                     omega_sys[omega_sys < nyquistfrq], nyquistfrq))
-            else:
-                if np.max(omega_sys) > nyquistfrq:
-                    warnings.warn("evaluation above Nyquist frequency")
 
             omega_complex = np.exp(1j * omega_sys * sys.dt)
         else:
diff --git a/control/tests/freqresp_test.py b/control/tests/freqresp_test.py
@@ -70,6 +70,7 @@ def test_bode_basic(ss_siso):
     assert len(bode_plot(tf_siso, plot=False, omega=np.logspace(-1,1,10))[0])\
          == 10
 
+
 def test_nyquist_basic(ss_siso):
     """Test nyquist plot call (Very basic)"""
     # TODO: proper test
@@ -367,7 +368,6 @@ def test_initial_phase(TF, initial_phase, default_phase, expected_phase):
      pytest.param(ctrl.tf([1], [1, 0, 0, 0, 0, 0]),
                   -270, -3*math.pi/2, math.pi/2,    id="order5, -270"),
     ])
-
 def test_phase_wrap(TF, wrap_phase, min_phase, max_phase):
     mag, phase, omega = ctrl.bode(TF, wrap_phase=wrap_phase)
     assert(min(phase) >= min_phase)
@@ -638,8 +638,7 @@ def test_singular_values_plot_mpl_superimpose_nyq(ss_mimo_ct, ss_mimo_dt):
     omega_all = np.logspace(-3, 2, 1000)
     plt.figure()
     singular_values_plot(sys_ct, omega_all, plot=True)
-    with pytest.warns(UserWarning):
-        singular_values_plot(sys_dt, omega_all, plot=True)
+    singular_values_plot(sys_dt, omega_all, plot=True)
     fig = plt.gcf()
     allaxes = fig.get_axes()
     assert(len(allaxes) == 1)
diff --git a/examples/singular-values-plot.ipynb b/examples/singular-values-plot.ipynb
@@ -2112,14 +2112,6 @@
      },
      "metadata": {},
      "output_type": "display_data"
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/marco/PycharmProjects/python-control/control/freqplot.py:1149: UserWarning: evaluation above Nyquist frequency\n",
-      "  warnings.warn(\"evaluation above Nyquist frequency\")\n"
-     ]
     }
    ],
    "source": [
@@ -3110,14 +3102,6 @@
      },
      "metadata": {},
      "output_type": "display_data"
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/marco/PycharmProjects/python-control/control/freqplot.py:1149: UserWarning: evaluation above Nyquist frequency\n",
-      "  warnings.warn(\"evaluation above Nyquist frequency\")\n"
-     ]
     }
    ],
    "source": [
@@ -3135,7 +3119,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 9,
    "id": "trying-breeding",
    "metadata": {},
    "outputs": [
@@ -4117,19 +4101,10 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 10,
    "id": "fresh-paragraph",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/marco/PycharmProjects/python-control/control/freqplot.py:1149: UserWarning: evaluation above Nyquist frequency\n",
-      "  warnings.warn(\"evaluation above Nyquist frequency\")\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "ct.freqplot.singular_values_plot(Gd, omega);"
    ]
@@ -4144,7 +4119,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 11,
    "id": "alike-holocaust",
    "metadata": {},
    "outputs": [],
@@ -4155,7 +4130,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 12,
    "id": "behind-idaho",
    "metadata": {},
    "outputs": [],
@@ -4165,7 +4140,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 13,
    "id": "danish-detroit",
    "metadata": {
     "scrolled": true
@@ -4177,7 +4152,7 @@
        "(array([197.20868123,   1.39141948]), array([197.20313497,   1.39138034]))"
       ]
      },
-     "execution_count": 12,
+     "execution_count": 13,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -4208,4 +4183,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 5
-}
+}
