Mercurial Hosting > traffic-intelligence

comparison python/moving.py @ 570:5adaab9ad160

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 06 Aug 2014 17:54:01 -0400
parents 0057c04f94d5 538fb47b3007
children a9c1d61a89b4
comparison
equal deleted inserted replaced
569:0057c04f94d5 570:5adaab9ad160
333 for spline_p in range(len(splines[spline])): 333 for spline_p in range(len(splines[spline])):
334 if spline_p > (len(splines[spline]) - 2): 334 if spline_p > (len(splines[spline]) - 2):
335 break 335 break
336 ss_spline_d[spline][0][spline_p] = utils.pointDistanceL2(splines[spline][spline_p][0],splines[spline][spline_p][1],splines[spline][(spline_p+1)][0],splines[spline][(spline_p+1)][1]) 336 ss_spline_d[spline][0][spline_p] = utils.pointDistanceL2(splines[spline][spline_p][0],splines[spline][spline_p][1],splines[spline][(spline_p+1)][0],splines[spline][(spline_p+1)][1])
337 ss_spline_d[spline][1][spline_p] = sum(ss_spline_d[spline][0][0:spline_p]) 337 ss_spline_d[spline][1][spline_p] = sum(ss_spline_d[spline][0][0:spline_p])
338 ss_spline_d[spline][2][spline_p] = sum(ss_spline_d[spline][0][0:spline_p]) 338 ss_spline_d[spline][2][spline_p] = ss_spline_d[spline][1][spline_p]#sum(ss_spline_d[spline][0][0:spline_p])
339 339
340 ss_spline_d[spline][2][-1] = ss_spline_d[spline][2][-2] + ss_spline_d[spline][0][-1] 340 ss_spline_d[spline][2][-1] = ss_spline_d[spline][2][-2] + ss_spline_d[spline][0][-1]
341 341
342 return ss_spline_d 342 return ss_spline_d
343 343
424 return [False,False,False,False,False,False,False] 424 return [False,False,False,False,False,False,False]
425 425
426 426
427 def getXYfromSY(s, y, splineNum, splines, mode = 0): 427 def getXYfromSY(s, y, splineNum, splines, mode = 0):
428 ''' Find X,Y coordinate from S,Y data. 428 ''' Find X,Y coordinate from S,Y data.
429 if Mode = 0 : return Snapped X,Y 429 if mode = 0 : return Snapped X,Y
430 if Mode !=0 : return Real X,Y 430 if mode !=0 : return Real X,Y
431 ''' 431 '''
432 432
433 #(buckle in, it gets ugly from here on out) 433 #(buckle in, it gets ugly from here on out)
434 ss_spline_d = subsec_spline_dist(splines) 434 ss_spline_d = subsec_spline_dist(splines)
435 435