diff trafficintelligence/cvutils.py @ 1112:956a66096e91

removed code now available in simulation project, and issue with deprecated find function in matplotlib
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 05 Jun 2019 13:12:10 -0400
parents c6cf75a2ed08
children b358bed29ab4
line wrap: on
line diff
--- a/trafficintelligence/cvutils.py	Mon May 06 17:13:13 2019 -0400
+++ b/trafficintelligence/cvutils.py	Wed Jun 05 13:12:10 2019 -0400
@@ -7,9 +7,8 @@
 from math import floor, log10, ceil
 from time import time
 
-from numpy import dot, array, append, float32, loadtxt, savetxt, append, zeros, ones, identity, abs as npabs, logical_and, unravel_index, sum as npsum, isnan, mgrid, median, floor as npfloor, ceil as npceil
+from numpy import dot, array, append, float32, loadtxt, savetxt, append, zeros, ones, identity, abs as npabs, logical_and, unravel_index, sum as npsum, isnan, mgrid, median, floor as npfloor, ceil as npceil, nonzero
 from numpy.linalg import inv
-from matplotlib.mlab import find
 from matplotlib.pyplot import imread, imsave, imshow, figure, subplot
 
 try:
@@ -428,7 +427,7 @@
         distx = npabs(map1-x)
         disty = npabs(map2-y)
         indices = logical_and(distx<maxDistance, disty<maxDistance)
-        closeCoordinates = unravel_index(find(indices), distx.shape) # returns i,j, ie y,x
+        closeCoordinates = unravel_index(nonzero(indices), distx.shape) # returns i,j, ie y,x
         xWeights = 1-distx[indices]
         yWeights = 1-disty[indices]
         return dot(xWeights, closeCoordinates[1])/npsum(xWeights), dot(yWeights, closeCoordinates[0])/npsum(yWeights)