Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
skais
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Raphael Sturgis
skais
Commits
0065d12e
Commit
0065d12e
authored
3 years ago
by
Raphael Sturgis
Browse files
Options
Downloads
Patches
Plain Diff
made AISTrajectory child of AISPoints
parent
2137c807
No related branches found
No related tags found
1 merge request
!6
Develop
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
skais/ais/ais_trajectory.py
+3
-2
3 additions, 2 deletions
skais/ais/ais_trajectory.py
with
3 additions
and
2 deletions
skais/ais/ais_trajectory.py
+
3
−
2
View file @
0065d12e
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment