Mercurial Hosting > traffic-intelligence
changeset 996:add667153087
updated feature tracker to opencv 3
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Fri, 25 May 2018 14:23:56 -0400 |
| parents | 349cd5e73f79 |
| children | 4f3387a242a1 c90c4682c67e |
| files | c/Makefile python/moving.py |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/c/Makefile Mon May 21 22:56:58 2018 -0400 +++ b/c/Makefile Fri May 25 14:23:56 2018 -0400 @@ -19,7 +19,7 @@ ifneq ($(OPENCV), 0) CFLAGS += -DUSE_OPENCV - LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc -lopencv_calib3d + LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc -lopencv_imgcodecs -lopencv_videoio -lopencv_calib3d endif #LDFLAGS += -Wl,--as-needed -Wl,-Bdynamic,-lgcc_s,-Bstatic
--- a/python/moving.py Mon May 21 22:56:58 2018 -0400 +++ b/python/moving.py Fri May 25 14:23:56 2018 -0400 @@ -5,7 +5,7 @@ from base import VideoFilenameAddable from math import sqrt, atan2, cos, sin -from numpy import median, array, arange, zeros, ones, hypot, NaN, std, floor, float32, argwhere, minimum +from numpy import median, mean, array, arange, zeros, ones, hypot, NaN, std, floor, float32, argwhere, minimum from matplotlib.pyplot import plot, text from scipy.stats import scoreatpercentile from scipy.spatial.distance import cdist @@ -1133,7 +1133,7 @@ # compute bounding polygon from trajectory @staticmethod - def aggregateTrajectory(features, aggFunc = np.mean): + def aggregateTrajectory(features, aggFunc = mean): 'Computes the aggregate trajectory from list of MovingObject features' return None