add aggregation and clustering work

enviroCar · Jun 20, 2020 · 6d448f1 · 6d448f1
1 parent 6e8ce4b
commit 6d448f1
Show file tree

Hide file tree

Showing 3 changed files with 3,112 additions and 17,154 deletions.
diff --git a/envirocar/trajectories/preprocessing.py b/envirocar/trajectories/preprocessing.py
@@ -47,7 +47,7 @@ def split_by_gap (self, TRAJ_COLLECTION, MIN_GAP):
         traj_collection = TRAJ_COLLECTION
 
         # using moving pandas function to split trajectories as 'trips'
-        trips = traj_collection.split_by_observation_gap(timedelta(minutes=MIN_GAP))
+        trips = traj_collection.split_by_observation_gap(datetime.timedelta(minutes=MIN_GAP))
         print("Extracted {} individual trips from {} continuous vehicle tracks".format(len(trips), len(traj_collection)))
         return trips
 

diff --git a/envirocar/trajectories/track_similarity.py b/envirocar/trajectories/track_similarity.py
@@ -7,7 +7,7 @@ class TrackSimilarity():
     def __init__(self):
         print("Initializing TrackSimilarity class")
 
-    def similarity(method,trajectoryA,trajectoryB):
+    def similarity(self, method,trajectoryA,trajectoryB):
 
         """ Compute similarity measures using the similaritymeasures
         https://pypi.org/project/similaritymeasures/