Skip to content
Snippets Groups Projects
Commit 2874e51c authored by Raphael Sturgis's avatar Raphael Sturgis
Browse files

fixed circular import

parent 0065d12e
No related branches found
No related tags found
1 merge request!6Develop
......@@ -2,8 +2,6 @@ import numpy as np
import pandas as pd
from scipy.stats import stats
from skais.ais.ais_trajectory import AISTrajectory
# def compute_trajectories(df, time_gap, min_size=50, size_limit=500, interpolation_time=None):
# n_sample = len(df.index)
......@@ -108,18 +106,6 @@ class AISPoints:
self.df["drift"] = self.df.apply(lambda x: 180 - abs(abs(x['heading'] - x['cog']) - 180),
axis=1)
# Trajectories
"""
Separates AISPoints into individual trajectories
"""
def get_trajectories(self):
trajectories = []
for mmsi in self.df.mmsi.unique():
trajectories.append(AISTrajectory(self.df[self.df['mmsi'] == mmsi].reset_index(drop=True)))
return trajectories
# Static methods
@staticmethod
def fuse(*args):
......
from skais.ais.ais_trajectory import AISTrajectory
# Trajectories
"""
Separates AISPoints into individual trajectories
"""
def get_trajectories(ais_points):
trajectories = []
for mmsi in ais_points.df.mmsi.unique():
trajectories.append(AISTrajectory(ais_points.df[ais_points.df['mmsi'] == mmsi].reset_index(drop=True)))
return trajectories
......@@ -179,38 +179,6 @@ class TestAISPositions(unittest.TestCase):
40, 30, 20, 10, 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110,
120, 130, 140, 150, 160, 170]))
def test_get_trajectories(self):
ais_points = AISPoints(
pd.DataFrame(
{
"mmsi": [123456789 for _ in range(10)] + [987654321 for _ in range(10)],
"ts_sec": [i for i in range(20)]
}
)
)
expected = [
AISTrajectory(
pd.DataFrame(
{
"mmsi": [123456789 for _ in range(10)],
"ts_sec": [i for i in range(10)]
}
)
),
AISTrajectory(
pd.DataFrame(
{
"mmsi": [987654321 for _ in range(10)],
"ts_sec": [10+ i for i in range(10)]
}
)
)
]
for expected_trajectory, result_trajectory in zip(expected, ais_points.get_trajectories()):
pd.testing.assert_frame_equal(expected_trajectory.df, result_trajectory.df)
# def test_histogram_no_label_simple(self):
# result = np.histogramdd(self.ais_points.df[["sog", "diff"]].to_numpy(), 3, [[0, 30], [0, 180]])[0]
#
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment