# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1404066438 14400
# Node ID e37f38274d4f9bd3a6cdc9434082d60eaebdb928
# Parent  018653d1db3c1e2760e0ae4696df6ecb7aeaa16f
fixed compiling issue with size()

diff -r 018653d1db3c -r e37f38274d4f c/feature-based-tracking.cpp
--- a/c/feature-based-tracking.cpp	Sun Jun 29 14:18:17 2014 -0400
+++ b/c/feature-based-tracking.cpp	Sun Jun 29 14:27:18 2014 -0400
@@ -160,7 +160,7 @@
   for (unsigned int frameNum = params.frame1; (frameNum < lastFrameNum) && !::interruptionKey(key); frameNum++) {
       bool success = capture->getNextFrame(frame);
       if (!success || frame.empty() || frame.size() != videoSize) {
-	cout << "Empty frame " << frameNum << ", breaking (" << success << " " << frame.empty() << " " << frame.size() << ")" << endl;
+	cout << "Empty frame " << frameNum << ", breaking (" << success << " " << frame.empty() << " [" << frame.size().width << "x" << frame.size().height << "])" << endl;
 	break;
       } else if (frameNum%50 ==0)
 	cout << "frame " << frameNum << endl;
diff -r 018653d1db3c -r e37f38274d4f scripts/safety-analysis.py
--- 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)