Mercurial > hg > nsaunier > traffic-intelligence

comparison trafficintelligence/events.py @ 1291:46a30ce1a2e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dealing with modified table structures
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 15 Aug 2024 17:04:16 -0400
parents 9f1711a85c56
children
comparison
equal deleted inserted replaced
1290:9012fb72d79a 1291:46a30ce1a2e4
215 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[2], distances, mostSevereIsMax = False)) 215 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[2], distances, mostSevereIsMax = False))
216 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[4], velocityAngles)) 216 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[4], velocityAngles))
217 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[5], speedDifferentials)) 217 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[5], speedDifferentials))
218 218
219 # if we have features, compute other indicators 219 # if we have features, compute other indicators
220 if self.roadUser1.hasFeatures() and self.roadUser2.hasFeatures(): 220 if self.roadUser1.hasFeatures() and self.roadUser2.hasFeatures() and len(self.roadUser1.getFeatures())>1 and len(self.roadUser2.getFeatures())>1:
221 minDistances={} 221 minDistances={}
222 for instant in self.timeInterval: 222 for instant in self.timeInterval:
223 minDistances[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant) 223 minDistances[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant)
224 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[3], minDistances, mostSevereIsMax = False)) 224 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[3], minDistances, mostSevereIsMax = False))
225 225