# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1496354140 14400
# Node ID 6624484c0d552494250f4310404470552dad87c2
# Parent  739acd338cc0c71a9006409ee8c308a29e4f3c20
modification to make point set prediction work

diff -r 739acd338cc0 -r 6624484c0d55 scripts/safety-analysis.py
--- 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: