diff python/prediction.py @ 489:000bddf84ad0

corrected bugs in safety analysis
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 11 Apr 2014 17:47:38 -0400
parents 6464e4f0cc26
children 727e3c529519
line wrap: on
line diff
--- a/python/prediction.py	Fri Apr 04 17:43:56 2014 -0400
+++ b/python/prediction.py	Fri Apr 11 17:47:38 2014 -0400
@@ -282,19 +282,19 @@
 
 class PointSetPredictionParameters(PredictionParameters):
     # todo generate several trajectories with normal adaptatoins from each position (feature)
-    def __init__(self, nPredictedTrajectories, maxSpeed):
+    def __init__(self, maxSpeed):
         PredictionParameters.__init__(self, 'point set', maxSpeed)
-        self.nPredictedTrajectories = nPredictedTrajectories
+        #self.nPredictedTrajectories = nPredictedTrajectories
     
     def generatePredictedTrajectories(self, obj, instant):
         predictedTrajectories = []        
         features = [f for f in obj.features if f.existsAtInstant(instant)]
         positions = [f.getPositionAtInstant(instant) for f in features]
         velocities = [f.getVelocityAtInstant(instant) for f in features]
-        for i in xrange(self.nPredictedTrajectories):
-            for initialPosition,initialVelocity in zip(positions, velocities):
-                predictedTrajectories.append(PredictedTrajectoryConstant(initialPosition, initialVelocity, 
-                                                                         maxSpeed = self.maxSpeed))
+        #for i in xrange(self.nPredictedTrajectories):
+        for initialPosition,initialVelocity in zip(positions, velocities):
+            predictedTrajectories.append(PredictedTrajectoryConstant(initialPosition, initialVelocity, 
+                                                                     maxSpeed = self.maxSpeed))
         return predictedTrajectories
 
 class EvasiveActionPredictionParameters(PredictionParameters):