Mercurial Hosting > traffic-intelligence
changeset 245:bd8ab323c198
corrected issue with predictPosiont static method
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Tue, 17 Jul 2012 13:25:34 -0400 |
| parents | 5027c174ab90 |
| children | 583a2c4622f9 |
| files | python/extrapolation.py python/moving.py |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/python/extrapolation.py Tue Jul 17 00:15:42 2012 -0400 +++ b/python/extrapolation.py Tue Jul 17 13:25:34 2012 -0400 @@ -26,7 +26,7 @@ def predictPosition(self, nTimeSteps): if not nTimeSteps in self.predictedPositions.keys(): - self.predictedPositions[nTimeSteps] = moving.Point.predictPosition(nTimeSteps, self.initialPosition, self.initialVelocity, self.initialAcceleration) + self.predictedPositions[nTimeSteps] = moving.predictPosition(nTimeSteps, self.initialPosition, self.initialVelocity, self.initialAcceleration) return self.predictedPositions[nTimeSteps] # Default values: to remove because we cannot tweak that from a script where the value may be different
--- a/python/moving.py Tue Jul 17 00:15:42 2012 -0400 +++ b/python/moving.py Tue Jul 17 13:25:34 2012 -0400 @@ -191,7 +191,6 @@ p1=p2 return (counter%2 == 1); - @staticmethod def dot(p1, p2): 'Scalar product' @@ -211,10 +210,11 @@ from matplotlib.pyplot import scatter scatter([p.x for p in points],[p.y for p in points], c=color) - @staticmethod - def predictPosition(nTimeSteps, initialPosition, initialVelocity, initialAcceleration = Point(0,0)): - '''Predicts the position in nTimeSteps at constant speed/acceleration''' - return initalPosition+velocity.multiply(nTimeSteps) + initialAcceleration.multiply(nTimeSteps**2) + +def predictPosition(nTimeSteps, initialPosition, initialVelocity, initialAcceleration = Point(0,0)): + '''Predicts the position in nTimeSteps at constant speed/acceleration''' + return initalPosition+velocity.multiply(nTimeSteps) + initialAcceleration.multiply(nTimeSteps**2) + class FlowVector: '''Class to represent 4-D flow vectors, @@ -516,7 +516,7 @@ def predictPosition(self, instant, nTimeSteps, externalAcceleration = Point(0,0)): '''Predicts the position of object at instant+deltaT, at constant speed''' - return Point.predictPosition(nTimeSteps, self.getPositionAtInstant(instant), self.getVelocityAtInstant(instant), externalAcceleration) + return predictPosition(nTimeSteps, self.getPositionAtInstant(instant), self.getVelocityAtInstant(instant), externalAcceleration) @staticmethod def collisionCourseDotProduct(movingObject1, movingObject2, instant):