diff --git a/skais/ais/ais_trajectory.py b/skais/ais/ais_trajectory.py index 41853864212c75a5cf89c0549ae6632927637872..157e2f0a424ff0584b541da7749a89787afc7016 100644 --- a/skais/ais/ais_trajectory.py +++ b/skais/ais/ais_trajectory.py @@ -29,7 +29,7 @@ def compute_trajectory(times, time_gap, size_limit): return i -@jit(nopython=True) +#@jit(nopython=True) def compute_std(dat, radius): stds = np.empty(dat.shape[0]) @@ -173,13 +173,14 @@ def l2_angle(dat, radius): def angle_dispersion(dat, radius): - l2 = np.zeros(dat.shape) + disp = np.zeros(dat.shape) dat = np.concatenate([np.full(radius, dat[0]), dat, np.full(radius, dat[-1])]) for i in range(radius, dat.shape[0] - radius): data = dat[i - radius:i + radius + 1] - l2[i - radius] = angular_dispersion(np.radians(data)) + disp[i - radius] = angular_dispersion(np.radians(data)) + return disp class AISTrajectory: def __init__(self, df, interpolation_time=None): @@ -283,8 +284,6 @@ class AISTrajectory: if field in self.df.columns: dat = self.df[field].to_numpy() disp = angle_dispersion(dat, radius) - disp[-radius:] = np.nan - disp[:radius] = np.nan self.df[f"{field}_disp"] = disp def compute_position_features(self, radius):