diff scripts/safety-analysis.py @ 351:891858351bcb

added new parameter (use features) for safety analysis
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 27 Jun 2013 00:25:51 -0400
parents 7e9ad2d9d79c
children 72aa44072093
line wrap: on
line diff
--- a/scripts/safety-analysis.py	Thu Jun 27 00:18:39 2013 -0400
+++ b/scripts/safety-analysis.py	Thu Jun 27 00:25:51 2013 -0400
@@ -25,23 +25,25 @@
 normalAdaptationPredictionParameters = prediction.NormalAdaptationPredictionParameters(params.maxPredictedSpeed, 
                                                                                        params.nPredictedTrajectories, 
                                                                                        params.maxAcceleration,
-                                                                                       params.maxSteering)
+                                                                                       params.maxSteering,
+                                                                                       params.useFeaturesForPrediction)
 
-featurePredictionParameters = prediction.PointSetPredictionParameters(params.maxPredictedSpeed, params.nPredictedTrajectories)
+featurePredictionParameters = prediction.PointSetPredictionParameters(params.maxPredictedSpeed, 
+                                                                      params.nPredictedTrajectories)
 
 evasiveActionPredictionParameters = prediction.EvasiveActionPredictionParameters(params.maxPredictedSpeed, 
                                                                                  params.nPredictedTrajectories, 
                                                                                  params.minAcceleration,
                                                                                  params.maxAcceleration,
                                                                                  params.maxSteering,
-                                                                                 False)
+                                                                                 params.useFeaturesForPrediction)
 
 featureEvasiveActionPredictionParameters = prediction.EvasiveActionPredictionParameters(params.maxPredictedSpeed, 
                                                                                         params.nPredictedTrajectories, 
                                                                                         params.minAcceleration,
                                                                                         params.maxAcceleration,
                                                                                         params.maxSteering,
-                                                                                        True)
+                                                                                        params.useFeaturesForPrediction)