Mercurial Hosting > traffic-intelligence
comparison trafficintelligence/moving.py @ 1182:0e5d37b0b9ff
bug corrections
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Fri, 01 Apr 2022 15:33:22 -0400 |
parents | b3b1a5dfa17c |
children | 38f0d0ceac3f |
comparison
equal
deleted
inserted
replaced
1181:b3b1a5dfa17c | 1182:0e5d37b0b9ff |
---|---|
1567 def getAccelerations(self, window_length, polyorder, delta=1.0, axis=-1, mode='interp', cval=0.0, speeds = None, nInstantsIgnoredAtEnds = 0): | 1567 def getAccelerations(self, window_length, polyorder, delta=1.0, axis=-1, mode='interp', cval=0.0, speeds = None, nInstantsIgnoredAtEnds = 0): |
1568 '''Returns the 1-D acceleration from the 1-D speeds | 1568 '''Returns the 1-D acceleration from the 1-D speeds |
1569 Caution about previously filtered data''' | 1569 Caution about previously filtered data''' |
1570 if speeds is None: | 1570 if speeds is None: |
1571 speeds = self.getSpeeds(nInstantsIgnoredAtEnds) | 1571 speeds = self.getSpeeds(nInstantsIgnoredAtEnds) |
1572 return savgol_filter(speeds, window_length, polyorder, 1, delta, axis, mode, cval) | 1572 return savgol_filter(speeds, min(window_length, len(speeds)), polyorder, 1, delta, axis, mode, cval) |
1573 | 1573 |
1574 def getSpeedIndicator(self): | 1574 def getSpeedIndicator(self): |
1575 from indicators import SeverityIndicator | 1575 from indicators import SeverityIndicator |
1576 return SeverityIndicator('Speed', {t:self.getVelocityAtInstant(t).norm2() for t in self.getTimeInterval()}) | 1576 return SeverityIndicator('Speed', {t:self.getVelocityAtInstant(t).norm2() for t in self.getTimeInterval()}) |
1577 | 1577 |