Skip to content
Snippets Groups Projects
Commit 29df63e3 authored by Raphael's avatar Raphael
Browse files

random

parent a0f688f4
Branches
Tags
1 merge request!6Develop
...@@ -29,7 +29,7 @@ def compute_trajectory(times, time_gap, size_limit): ...@@ -29,7 +29,7 @@ def compute_trajectory(times, time_gap, size_limit):
return i return i
@jit(nopython=True) #@jit(nopython=True)
def compute_std(dat, radius): def compute_std(dat, radius):
stds = np.empty(dat.shape[0]) stds = np.empty(dat.shape[0])
...@@ -173,13 +173,14 @@ def l2_angle(dat, radius): ...@@ -173,13 +173,14 @@ def l2_angle(dat, radius):
def angle_dispersion(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])]) dat = np.concatenate([np.full(radius, dat[0]), dat, np.full(radius, dat[-1])])
for i in range(radius, dat.shape[0] - radius): for i in range(radius, dat.shape[0] - radius):
data = dat[i - radius:i + radius + 1] 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: class AISTrajectory:
def __init__(self, df, interpolation_time=None): def __init__(self, df, interpolation_time=None):
...@@ -283,8 +284,6 @@ class AISTrajectory: ...@@ -283,8 +284,6 @@ class AISTrajectory:
if field in self.df.columns: if field in self.df.columns:
dat = self.df[field].to_numpy() dat = self.df[field].to_numpy()
disp = angle_dispersion(dat, radius) disp = angle_dispersion(dat, radius)
disp[-radius:] = np.nan
disp[:radius] = np.nan
self.df[f"{field}_disp"] = disp self.df[f"{field}_disp"] = disp
def compute_position_features(self, radius): def compute_position_features(self, radius):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment