--- a/scripts/safety-analysis.py	Sun Jun 29 14:18:17 2014 -0400
+++ b/scripts/safety-analysis.py	Sun Jun 29 14:27:18 2014 -0400
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-import utils, storage, prediction, events, moving
+import storage, prediction, events, moving
 
 import sys, argparse, random
 
@@ -16,7 +16,7 @@
 parser.add_argument('--display-cp', dest = 'displayCollisionPoints', help = 'display collision points', action = 'store_true')
 args = parser.parse_args()
 
-params = utils.TrackingParameters()
+params = storage.TrackingParameters()
 params.loadConfigFile(args.configFilename)
 
 # parameters for prediction methods
@@ -28,7 +28,7 @@
 accelerationDistribution = lambda: random.triangular(-params.maxNormalAcceleration, params.maxNormalAcceleration, 0.)
 steeringDistribution = lambda: random.triangular(-params.maxNormalSteering, params.maxNormalSteering, 0.)
 
-if predictionMethod == 'cvd':
+if predictionMethod == 'cvd': # TODO add cve: constant velocity exact (Sohail's)
     predictionParameters = prediction.CVDirectPredictionParameters()
 elif predictionMethod == 'cv':
     predictionParameters = prediction.ConstantPredictionParameters(params.maxPredictedSpeed)