Mercurial Hosting > traffic-intelligence

diff python/prediction.py @ 571:a9c1d61a89b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bug for segment intersection
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 07 Aug 2014 00:05:14 -0400
parents 806df5f61c03
children 84690dfe5560
line wrap: on
line diff
--- a/python/prediction.py	Wed Aug 06 17:54:01 2014 -0400
+++ b/python/prediction.py	Thu Aug 07 00:05:14 2014 -0400
@@ -166,7 +166,7 @@
                         #if (et1.predictPosition(t1)-et2.predictPosition(t2)).norm2() < collisionDistanceThreshold:
                         #    cz = (et1.predictPosition(t1)+et2.predictPosition(t2)).multiply(0.5)
                         cz = moving.segmentIntersection(et1.predictPosition(t1), et1.predictPosition(t1+1), et2.predictPosition(t2), et2.predictPosition(t2+1))
-                        if cz:
+                        if cz != None:
                             crossingZones.append(SafetyPoint(cz, et1.probability*et2.probability, abs(t1-t2)))
                         t2 += 1
                     t1 += 1