Mercurial Hosting > traffic-intelligence
changeset 857:6d89520e269f
minor modifications to safety-analysis
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Thu, 06 Oct 2016 17:16:31 -0400 |
| parents | e310577cc0b8 |
| children | 2faabcbde2c4 |
| files | scripts/safety-analysis.py |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/safety-analysis.py Wed Oct 05 13:31:42 2016 -0400 +++ b/scripts/safety-analysis.py Thu Oct 06 17:16:31 2016 -0400 @@ -12,15 +12,17 @@ parser = argparse.ArgumentParser(description='The program processes indicators for all pairs of road users in the scene') parser.add_argument('--cfg', dest = 'configFilename', help = 'name of the configuration file', required = True) +parser.add_argument('-n', dest = 'nObjects', help = 'number of objects to analyse', type = int) +# TODO analyze only parser.add_argument('--prediction-method', dest = 'predictionMethod', help = 'prediction method (constant velocity (vector computation), constant velocity, normal adaptation, point set prediction)', choices = ['cvd', 'cv', 'na', 'ps']) parser.add_argument('--display-cp', dest = 'displayCollisionPoints', help = 'display collision points', action = 'store_true') -parser.add_argument('-n', dest = 'nProcesses', help = 'number of processes to run in parallel', type = int, default = 1) +parser.add_argument('--nthreads', dest = 'nProcesses', help = 'number of processes to run in parallel', type = int, default = 1) args = parser.parse_args() params = storage.ProcessParameters(args.configFilename) # parameters for prediction methods -if args.predictionMethod: +if args.predictionMethod is not None: predictionMethod = args.predictionMethod else: predictionMethod = params.predictionMethod @@ -51,11 +53,11 @@ # params.maxExtremeSteering, # params.useFeaturesForPrediction) -objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename,'object') -if params.useFeaturesForPrediction: - features = storage.loadTrajectoriesFromSqlite(params.databaseFilename,'feature') # needed if normal adaptation - for obj in objects: - obj.setFeatures(features) +objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename, 'object', args.nObjects, withFeatures = params.useFeaturesForPrediction) +# if params.useFeaturesForPrediction: +# features = storage.loadTrajectoriesFromSqlite(params.databaseFilename,'feature') # needed if normal adaptation +# for obj in objects: +# obj.setFeatures(features) interactions = events.createInteractions(objects) for inter in interactions: