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

made AISTrajectory child of AISPoints

parent 2137c807
No related branches found
No related tags found
1 merge request!6Develop
...@@ -5,6 +5,7 @@ import numpy as np ...@@ -5,6 +5,7 @@ import numpy as np
from numba import jit from numba import jit
from scipy.interpolate import interp1d from scipy.interpolate import interp1d
from skais.ais.ais_points import AISPoints
from skais.process.basic_features_operations import angular_dispersion from skais.process.basic_features_operations import angular_dispersion
from skais.utils.geography import great_circle from skais.utils.geography import great_circle
from skais.utils.stats import calc_std_dev from skais.utils.stats import calc_std_dev
...@@ -213,7 +214,7 @@ def apply_time_sequence(dat, time, func): ...@@ -213,7 +214,7 @@ def apply_time_sequence(dat, time, func):
return result return result
class AISTrajectory: class AISTrajectory(AISPoints):
def __init__(self, df, interpolation_time=None): def __init__(self, df, interpolation_time=None):
df = df.drop_duplicates(subset=['ts_sec']) df = df.drop_duplicates(subset=['ts_sec'])
...@@ -243,7 +244,7 @@ class AISTrajectory: ...@@ -243,7 +244,7 @@ class AISTrajectory:
df = new_df df = new_df
# self.df = df.dropna() # self.df = df.dropna()
self.df = df AISPoints.__init__(df)
def __eq__(self, other): def __eq__(self, other):
return self.df.equals(other.df) return self.df.equals(other.df)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment