Mercurial Hosting > traffic-intelligence
comparison python/events.py @ 691:fa9aa5f08210 dev
cleaned imports in indicators.py
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 29 Jun 2015 16:15:04 -0400 |
parents | 15e244d2a1b5 |
children | 9a258687af4c |
comparison
equal
deleted
inserted
replaced
690:463150a8e129 | 691:fa9aa5f08210 |
---|---|
190 self.interactionInterval = moving.TimeInterval(interactionInstants[0], interactionInstants[-1]) | 190 self.interactionInterval = moving.TimeInterval(interactionInstants[0], interactionInstants[-1]) |
191 else: | 191 else: |
192 self.interactionInterval = moving.TimeInterval() | 192 self.interactionInterval = moving.TimeInterval() |
193 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[0], collisionCourseDotProducts)) | 193 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[0], collisionCourseDotProducts)) |
194 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[1], collisionCourseAngles)) | 194 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[1], collisionCourseAngles)) |
195 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[2], distances)) | 195 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[2], distances, mostSevereIsMax = False)) |
196 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[4], velocityAngles)) | 196 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[4], velocityAngles)) |
197 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[5], speedDifferentials)) | 197 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[5], speedDifferentials)) |
198 | 198 |
199 # if we have features, compute other indicators | 199 # if we have features, compute other indicators |
200 if self.roadUser1.hasFeatures() and self.roadUser2.hasFeatures(): | 200 if self.roadUser1.hasFeatures() and self.roadUser2.hasFeatures(): |
201 minDistance={} | 201 minDistances={} |
202 for instant in self.timeInterval: | 202 for instant in self.timeInterval: |
203 minDistance[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant) | 203 minDistances[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant) |
204 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[3], minDistance)) | 204 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[3], minDistances, mostSevereIsMax = False)) |
205 | 205 |
206 def computeCrossingsCollisions(self, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, timeInterval = None, nProcesses = 1, usePrototypes=False, route1= (-1,-1), route2=(-1,-1), prototypes={}, secondStepPrototypes={}, nMatching={}, objects=[], noiseEntryNums=[], noiseExitNums=[], minSimilarity=0.1, mostMatched=None, useDestination=True, useSpeedPrototype=True, acceptPartialLength=30, step=1): | 206 def computeCrossingsCollisions(self, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, timeInterval = None, nProcesses = 1, usePrototypes=False, route1= (-1,-1), route2=(-1,-1), prototypes={}, secondStepPrototypes={}, nMatching={}, objects=[], noiseEntryNums=[], noiseExitNums=[], minSimilarity=0.1, mostMatched=None, useDestination=True, useSpeedPrototype=True, acceptPartialLength=30, step=1): |
207 '''Computes all crossing and collision points at each common instant for two road users. ''' | 207 '''Computes all crossing and collision points at each common instant for two road users. ''' |
208 TTCs = {} | 208 TTCs = {} |
209 if usePrototypes: | 209 if usePrototypes: |