Mercurial Hosting > traffic-intelligence
comparison python/moving.py @ 568:538fb47b3007
minor modification
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 06 Aug 2014 00:09:37 -0400 |
parents | 072cedc3f33d |
children | 5adaab9ad160 |
comparison
equal
deleted
inserted
replaced
567:072cedc3f33d | 568:538fb47b3007 |
---|---|
347 for spline_p in range(len(splines[spline])): | 347 for spline_p in range(len(splines[spline])): |
348 if spline_p > (len(splines[spline]) - 2): | 348 if spline_p > (len(splines[spline]) - 2): |
349 break | 349 break |
350 ss_spline_d[spline][0][spline_p] = ppd(splines[spline][spline_p][0],splines[spline][spline_p][1],splines[spline][(spline_p+1)][0],splines[spline][(spline_p+1)][1]) # TODO use points and remove ppd | 350 ss_spline_d[spline][0][spline_p] = ppd(splines[spline][spline_p][0],splines[spline][spline_p][1],splines[spline][(spline_p+1)][0],splines[spline][(spline_p+1)][1]) # TODO use points and remove ppd |
351 ss_spline_d[spline][1][spline_p] = sum(ss_spline_d[spline][0][0:spline_p]) | 351 ss_spline_d[spline][1][spline_p] = sum(ss_spline_d[spline][0][0:spline_p]) |
352 ss_spline_d[spline][2][spline_p] = sum(ss_spline_d[spline][0][0:spline_p]) | 352 ss_spline_d[spline][2][spline_p] = ss_spline_d[spline][1][spline_p]#sum(ss_spline_d[spline][0][0:spline_p]) |
353 | 353 |
354 ss_spline_d[spline][2][-1] = ss_spline_d[spline][2][-2] + ss_spline_d[spline][0][-1] | 354 ss_spline_d[spline][2][-1] = ss_spline_d[spline][2][-2] + ss_spline_d[spline][0][-1] |
355 | 355 |
356 return ss_spline_d | 356 return ss_spline_d |
357 | 357 |
438 return [False,False,False,False,False,False,False] | 438 return [False,False,False,False,False,False,False] |
439 | 439 |
440 | 440 |
441 def getXYfromSY(s, y, splineNum, splines, mode = 0): | 441 def getXYfromSY(s, y, splineNum, splines, mode = 0): |
442 ''' Find X,Y coordinate from S,Y data. | 442 ''' Find X,Y coordinate from S,Y data. |
443 if Mode = 0 : return Snapped X,Y | 443 if mode = 0 : return Snapped X,Y |
444 if Mode !=0 : return Real X,Y | 444 if mode !=0 : return Real X,Y |
445 ''' | 445 ''' |
446 | 446 |
447 #(buckle in, it gets ugly from here on out) | 447 #(buckle in, it gets ugly from here on out) |
448 ss_spline_d = subsec_spline_dist(splines) | 448 ss_spline_d = subsec_spline_dist(splines) |
449 | 449 |