aboutsummaryrefslogtreecommitdiff
path: root/evaluate.py
diff options
context:
space:
mode:
authornunzip <np_scarh@e4-pattern-vm.europe-west4-a.c.electric-orbit-223819.internal>2018-12-08 18:38:53 +0000
committernunzip <np_scarh@e4-pattern-vm.europe-west4-a.c.electric-orbit-223819.internal>2018-12-08 18:38:53 +0000
commitf53d0b1eccb4d864cbee49a2267a1c0622d09ca4 (patch)
tree2ae6eafc131b9e40a04846bce46740eea627a1b5 /evaluate.py
parent5bf005f123a3ba9c90544654cea38b98603adb9a (diff)
parentaaee9b10aab7c78c7a02d5caec4ed37b85dff1bd (diff)
downloadvz215_np1915-f53d0b1eccb4d864cbee49a2267a1c0622d09ca4.tar.gz
vz215_np1915-f53d0b1eccb4d864cbee49a2267a1c0622d09ca4.tar.bz2
vz215_np1915-f53d0b1eccb4d864cbee49a2267a1c0622d09ca4.zip
Merge branch 'master' of skozl.com:e4-pattern
Diffstat (limited to 'evaluate.py')
-rwxr-xr-xevaluate.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/evaluate.py b/evaluate.py
index ebfc34e..7ce586b 100755
--- a/evaluate.py
+++ b/evaluate.py
@@ -86,7 +86,8 @@ def test_model(gallery_data, probe_data, gallery_label, probe_label, gallery_cam
else:
if args.mahalanobis:
# metric = 'jaccard' is also valid
- distances = cdist(probe_data, gallery_data, 'jaccard')
+ cov_inv = np.linalg.inv(np.cov(gallery_data.T)).T
+ distances = cdist(probe_data, gallery_data, 'mahalanobis', VI=cov_inv)
else:
distances = cdist(probe_data, gallery_data, 'euclidean')