Mercurial Hosting > traffic-intelligence
changeset 533:e37f38274d4f
fixed compiling issue with size()
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Sun, 29 Jun 2014 14:27:18 -0400 |
| parents | 018653d1db3c |
| children | d0419b1267dd |
| files | c/feature-based-tracking.cpp scripts/safety-analysis.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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)