--- a/scripts/safety-analysis.py	Thu Jun 20 15:47:33 2013 -0400
+++ b/scripts/safety-analysis.py	Fri Jun 21 15:28:59 2013 -0400
@@ -27,6 +27,8 @@
 collisionDistanceThreshold= 1.8 # m
 computeCZ = True
 
+display = False
+
 # parameters for prediction methods
 constantVelocityPredictionParameters = prediction.ConstantPredictionParameters(maxSpeed)
 
@@ -52,14 +54,18 @@
 
 interactions = events.createInteractions(objects)
 for inter in interactions[:2]:
-    inter.computeCrossingsCollisions(constantVelocityPredictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ)
+    inter.computeIndicators()
+    # inter.computeCrossingsCollisions(constantVelocityPredictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ)
+
+storage.saveIndicators(params.databaseFilename, interactions)
 
-plt.figure()
-plt.axis('equal')
-for inter in interactions[:2]:
-    for collisionPoints in inter.collisionPoints.values():
-        for cp in collisionPoints:
-            plot([cp.x], [cp.y], 'x')
+if display:
+    plt.figure()
+    plt.axis('equal')
+    for inter in interactions[:2]:
+        for collisionPoints in inter.collisionPoints.values():
+            for cp in collisionPoints:
+                plot([cp.x], [cp.y], 'x')
 
 # for the demo, output automatically a map
 # possibility to process longitudinal coords only