Test fix

Author: dbookstaber

py_ballisticcalc/engines/scipy_engine.py

@@ -728,7 +728,7 @@ def event_max_drop(t: float, s: Any) -> np.floating:  # Stop when y crosses down
         def event_min_velocity(t: float, s: Any) -> np.floating:  # Stop when velocity < _cMinimumVelocity
             v = np.linalg.norm(s[3:6])
             return v - _cMinimumVelocity
-        #TODO: Either don't add this event, or always return 0 if _cMinimumVelocity<=0.
+        #TODO: If _cMinimumVelocity<=0 then: either don't add this event, or always return 0.
         traj_events: List[SciPyEvent] = [event_max_range, event_max_drop, event_min_velocity]
 
         slant_sine = math.sin(props.look_angle_rad)
@@ -781,14 +781,14 @@ def make_row(t: float, state: np.ndarray, flag: Union[TrajFlag, int]) -> Traject
                 """Helper function to create a TrajectoryData row."""
                 position = Vector(*state[0:3])
                 velocity = Vector(*state[3:6])
-                density_ratio, mach = props.get_density_and_mach_for_altitude(position[1])
+                _, mach = props.get_density_and_mach_for_altitude(position[1])
                 return TrajectoryData.from_props(props, t, position, velocity, mach, flag)
 
             if sol.t[-1] == 0:
                 # If the last time is 0, we only have the initial state
                 ranges.append(make_row(sol.t[0], sol.y[:, 0], TrajFlag.RANGE))
             else:
-                # List of distances at which we want to record the trajectory data
+                # List of distances at which we want to record the trajectory data, based on range_step
                 desired_xs = np.arange(0, range_limit_ft + range_step_ft, range_step_ft)
                 # Get x and t arrays from the solution
                 x_vals = sol.y[0]
@@ -838,7 +838,7 @@ def x_minus_target(t):  # Function for root finding: x(t) - x_target
                     states_at_x.append(sol.y[:, -1])  # Last state at the end of integration
 
                 states_at_x_arr_t: np.ndarray[Any, np.dtype[np.float64]] = np.array(states_at_x,
-                                                                                    dtype=np.float64).T  # shape: (state_dim, num_points)
+                                                                dtype=np.float64).T  # shape: (state_dim, num_points)
                 for i in range(states_at_x_arr_t.shape[1]):
                     ranges.append(make_row(t_at_x[i], states_at_x_arr_t[:, i], TrajFlag.RANGE))
                 ranges.sort(key=lambda t: t.time)  # Sort by time
@@ -849,6 +849,7 @@ def x_minus_target(t):  # Function for root finding: x(t) - x_target
                         while ranges[next_record].time - time_of_last_record > time_step + self.SEPARATE_ROW_TIME_DELTA:
                             time_of_last_record += time_step
                             ranges.append(make_row(time_of_last_record, sol.sol(time_of_last_record), TrajFlag.RANGE))
+                        time_of_last_record = ranges[next_record].time
                     ranges.sort(key=lambda t: t.time)  # Sort by time
 
             # region Find TrajectoryData points requested by filter_flags

py_ballisticcalc/trajectory_data.py

@@ -255,8 +255,7 @@ def get_key_val(td: "BaseTrajData", path: str) -> float:
                 top, component = path.split('.', 1)
                 obj = getattr(td, top)
                 return getattr(obj, component)
-            else:
-                return getattr(td, path)
+            return getattr(td, path)
 
         # independent variable values
         x0 = get_key_val(p0, key_attribute)
@@ -299,6 +298,7 @@ def _interp_scalar(y0, y1, y2):
     'y': 'height',
     'z': 'windage',
 }
+# pylint: disable=too-many-instance-attributes,protected-access
 class TrajectoryData(NamedTuple):
     """Data for one point in ballistic trajectory."""
 

tests/test_trajectory.py

@@ -250,7 +250,7 @@ def test_no_rows_closer_than_merge_threshold(self, loaded_engine_instance):
         calc = Calculator(engine=loaded_engine_instance)
         shot = self._mk_shot(2800.0)
         # Request multiple flags and dense-ish sampling to provoke close-by events
-        res = calc.fire(shot, trajectory_range=Distance.Yard(1000), trajectory_step=Distance.Yard(50),
+        res = calc.fire(shot, trajectory_range=Distance.Yard(500), trajectory_step=Distance.Yard(50),
                         time_step=0.001, flags=TrajFlag.ALL, raise_range_error=False)
         dt_thresh = BaseIntegrationEngine.SEPARATE_ROW_TIME_DELTA
         times = [td.time for td in res.trajectory]