changeset 896:6624484c0d55

modification to make point set prediction work
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 01 Jun 2017 17:55:40 -0400
parents 739acd338cc0
children f5a49b603e8b
files scripts/safety-analysis.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/safety-analysis.py	Thu Jun 01 14:54:11 2017 -0400
+++ b/scripts/safety-analysis.py	Thu Jun 01 17:55:40 2017 -0400
@@ -56,7 +56,7 @@
 #                                                                                  params.maxExtremeSteering,
 #                                                                                  params.useFeaturesForPrediction)
 
-objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename, 'object', args.nObjects, withFeatures = params.useFeaturesForPrediction)
+objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename, 'object', args.nObjects, withFeatures = (params.useFeaturesForPrediction or (predictionMethod == 'ps')))
 # if params.useFeaturesForPrediction:
 #     features = storage.loadTrajectoriesFromSqlite(params.databaseFilename,'feature') # needed if normal adaptation
 #     for obj in objects: