--- a/scripts/safety-analysis.py	Fri Jul 21 11:31:42 2017 -0400
+++ b/scripts/safety-analysis.py	Fri Jul 21 12:11:55 2017 -0400
@@ -56,7 +56,7 @@
         prototypes = storage.loadPrototypesFromSqlite(args.prototypeDatabaseFilename)
     for p in prototypes:
         p.getMovingObject().computeCumulativeDistances()
-    predictionParameters = prediction.PrototypePredictionParameters(prototypes, params.nPredictedTrajectories, 2., 0.4, 'cityblock', 10, params.constantSpeedPrototypePrediction, params.useFeaturesForPrediction)
+    predictionParameters = prediction.PrototypePredictionParameters(prototypes, params.nPredictedTrajectories, params.maxLcssDistance, params.minLcssSimilarity, params.lcssMetric, params.minFeatureTime, params.constantSpeedPrototypePrediction, params.useFeaturesForPrediction)
 # else:
 # no else required, since parameters is required as argument
 
@@ -68,16 +68,13 @@
 #                                                                                  params.useFeaturesForPrediction)
 
 objects = storage.loadTrajectoriesFromSqlite(params.databaseFilename, 'object', args.nObjects, withFeatures = (params.useFeaturesForPrediction or predictionMethod == 'ps' or predictionMethod == 'mp'))
-# 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:
+    print('processing interaction {}'.format(inter.getNum())
     inter.computeIndicators()
     if not args.noMotionPrediction:
-        inter.computeCrossingsCollisions(predictionParameters, params.collisionDistance, params.predictionTimeHorizon, params.crossingZones, nProcesses = args.nProcesses, debug = True)
+        inter.computeCrossingsCollisions(predictionParameters, params.collisionDistance, params.predictionTimeHorizon, params.crossingZones, nProcesses = args.nProcesses)
 
 if args.computePET:
     for inter in interactions: