cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small refactor for sanity

Browse Source
This commit is contained in:
Rafa de la Torre
2016-07-06 16:04:41 +02:00
parent 7ddb3da60d
commit 6c4829df01
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/lib/python/cartodb_services/cartodb_services/mapzen/isolines.py
View File

@@ -31,6 +31,7 @@ class MapzenIsolines:
# NOTE: not for production
#logging.basicConfig(level=logging.DEBUG, filename='/tmp/isolines.log')
#logging.basicConfig(level=logging.DEBUG)
logging.debug('origin = %s' % origin)
logging.debug('transport_mode = %s' % transport_mode)
logging.debug('isorange = %d' % isorange)
@@ -50,15 +51,15 @@ class MapzenIsolines:
rmin = [0.0] * self.NUMBER_OF_ANGLES
location_estimates = [self._calculate_dest_location(origin, a, upper_rmax / 2.0) for a in angles]
# calculate the "actual" cost for each location estimate as first iteration
# NOTE: sometimes it cannot calculate the cost and returns None. Just assume isorange and stop the calculations there
resp = self._matrix_client.one_to_many([origin] + location_estimates, 'pedestrian')
costs = [(c['time'] or isorange) for c in resp['one_to_many'][0][1:]]
#import pdb; pdb.set_trace()
# iterate to refine the first solution, if needed
# Iterate to refine the first solution
for i in xrange(0, self.MAX_ITERS):
logging.debug('costs = %s' % costs)
# Calculate the "actual" cost for each location estimate.
# NOTE: sometimes it cannot calculate the cost and returns None.
# Just assume isorange and stop the calculations there
response = self._matrix_client.one_to_many([origin] + location_estimates, 'pedestrian')
costs = [(c['time'] or isorange) for c in response['one_to_many'][0][1:]]
logging.debug('i = %d, costs = %s' % (i, costs))
errors = [(cost - isorange) / float(isorange) for cost in costs]
max_abs_error = max([abs(e) for e in errors])
if max_abs_error <= self.TOLERANCE:
@@ -73,11 +74,8 @@ class MapzenIsolines:
rmax[j] = (rmax[j] + rmin[j]) / 2.0
else:
rmin[j] = (rmax[j] + rmin[j]) / 2.0
location_estimates[j] = self._calculate_dest_location(origin, angles[j], (rmax[j]+rmin[j])/2.0)
# and check "actual" costs again
resp = self._matrix_client.one_to_many([origin] + location_estimates, 'pedestrian')
costs = [(c['time'] or isorange) for c in resp['one_to_many'][0][1:]]
location_estimates[j] = self._calculate_dest_location(origin, angles[j], (rmax[j]+rmin[j])/2.0)
return location_estimates

2
server/lib/python/cartodb_services/test/test_mapzenisolines.py
View File

@@ -65,7 +65,7 @@ class MatrixClientMock():
class MapzenIsolinesTestCase(unittest.TestCase):
def setUp(self):
speed = 6 # in km/h
speed = 4 # in km/h
matrix_client = MatrixClientMock(speed)
self.mapzen_isolines = MapzenIsolines(matrix_client)