# HG changeset patch # User Nicolas Saunier # Date 1371232020 14400 # Node ID 124f85c6cfae80937246f83efdf8fe757168cf63 # Parent 3950bfe2276803d395295e9e84cc7eabd092c26a modifed default probability to float diff -r 3950bfe22768 -r 124f85c6cfae python/prediction.py --- a/python/prediction.py Fri Jun 14 11:47:24 2013 -0400 +++ b/python/prediction.py Fri Jun 14 13:47:00 2013 -0400 @@ -37,7 +37,7 @@ '''Predicted trajectory at constant speed or acceleration TODO generalize by passing a series of velocities/accelerations''' - def __init__(self, initialPosition, initialVelocity, control = moving.NormAngle(0,0), probability = 1, maxSpeed = None): + def __init__(self, initialPosition, initialVelocity, control = moving.NormAngle(0,0), probability = 1., maxSpeed = None): self.control = control self.maxSpeed = maxSpeed self.probability = probability @@ -49,7 +49,7 @@ class PredictedTrajectoryNormalAdaptation(PredictedTrajectory): '''Random small adaptation of vehicle control ''' - def __init__(self, initialPosition, initialVelocity, accelerationDistribution, steeringDistribution, probability = 1, maxSpeed = None): + def __init__(self, initialPosition, initialVelocity, accelerationDistribution, steeringDistribution, probability = 1., maxSpeed = None): '''Constructor accelerationDistribution and steeringDistribution are distributions that return random numbers drawn from them'''