Merge pull request #8 from nasa/bug/uav_test_times

Bug fixes for tests for uav model and surrogates

Author: teubert

tests/test_surrogates.py

@@ -420,10 +420,10 @@ def future_loading(t, x=None):
             self.assertAlmostEqual(surrogate_noise_results.states[i]['Vo'], surrogate_results.states[i]['Vo'], delta=0.1)
             self.assertAlmostEqual(surrogate_noise_results.states[i]['Vsn'], surrogate_results.states[i]['Vsn'], delta=0.5)
             self.assertAlmostEqual(surrogate_noise_results.states[i]['Vsp'], surrogate_results.states[i]['Vsp'], delta=0.1)
-            self.assertAlmostEqual(surrogate_noise_results.states[i]['qnB'], surrogate_results.states[i]['qnB'], delta=15)
-            self.assertAlmostEqual(surrogate_noise_results.states[i]['qnS'], surrogate_results.states[i]['qnS'], delta=3)
-            self.assertAlmostEqual(surrogate_noise_results.states[i]['qpB'], surrogate_results.states[i]['qpB'], delta=15)
-            self.assertAlmostEqual(surrogate_noise_results.states[i]['qpS'], surrogate_results.states[i]['qpS'], delta=3)
+            self.assertAlmostEqual(surrogate_noise_results.states[i]['qnB'], surrogate_results.states[i]['qnB'], delta=55)
+            self.assertAlmostEqual(surrogate_noise_results.states[i]['qnS'], surrogate_results.states[i]['qnS'], delta=8)
+            self.assertAlmostEqual(surrogate_noise_results.states[i]['qpB'], surrogate_results.states[i]['qpB'], delta=55)
+            self.assertAlmostEqual(surrogate_noise_results.states[i]['qpS'], surrogate_results.states[i]['qpS'], delta=8)
             self.assertAlmostEqual(surrogate_noise_results.states[i]['v'], surrogate_results.states[i]['v'], delta=0.3)
             self.assertAlmostEqual(surrogate_noise_results.states[i]['EOD'], surrogate_results.states[i]['EOD'],delta=0.1)
             self.assertEqual(surrogate_noise_results.states[i]['v'], surrogate_noise_results.outputs[i]['v'])

tests/test_uav_model.py

@@ -238,7 +238,7 @@ def test_controllers_and_vehicle(self):
         x_sim_interp = interp1d(sim.times, x_temp)(ref_traj['t'])
         y_sim_interp = interp1d(sim.times, y_temp)(ref_traj['t'])
         z_sim_interp = interp1d(sim.times, z_temp)(ref_traj['t'])
-        for iter in range(min(len(sim.times), len(ref_traj['t']))):
+        for iter in range(len(ref_traj['t'])):
             self.assertAlmostEqual(ref_traj['x'][iter], x_sim_interp[iter], delta=5)
             self.assertAlmostEqual(ref_traj['y'][iter], y_sim_interp[iter], delta=5)
             self.assertAlmostEqual(ref_traj['z'][iter], z_sim_interp[iter], delta=5)
@@ -268,7 +268,7 @@ def test_controllers_and_vehicle(self):
         x_speeds_sim_interp = interp1d(sim_speeds.times, x_speeds_temp)(ref_traj_speeds['t'])
         y_speeds_sim_interp = interp1d(sim_speeds.times, y_speeds_temp)(ref_traj_speeds['t'])
         z_speeds_sim_interp = interp1d(sim_speeds.times, z_speeds_temp)(ref_traj_speeds['t'])
-        for iter in range(len(sim_speeds.times)):
+        for iter in range(len(ref_traj_speeds['t'])):
             self.assertAlmostEqual(ref_traj_speeds['x'][iter], x_speeds_sim_interp[iter], delta=8)
             self.assertAlmostEqual(ref_traj_speeds['y'][iter], y_speeds_sim_interp[iter], delta=8)
             self.assertAlmostEqual(ref_traj_speeds['z'][iter], z_speeds_sim_interp[iter], delta=8)