diff python/utils.py @ 483:30b3455978d9

Corrected issues with safety-analysis script, variable names are changed and tracking.cfg accordingly
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 02 Apr 2014 17:25:50 -0400
parents 825e5d49325d
children 343cfd185ca6
line wrap: on
line diff
--- a/python/utils.py	Wed Apr 02 16:12:24 2014 -0400
+++ b/python/utils.py	Wed Apr 02 17:25:50 2014 -0400
@@ -593,6 +593,9 @@
 #########################
 
 class TrackingParameters:
+    '''Class for tracking and safety parameters
+
+    Note: framerate is already taken into account'''
     def loadConfigFile(self, filename):
         from ConfigParser import ConfigParser
         from numpy import loadtxt
@@ -617,9 +620,11 @@
         self.crossingZones = config.getboolean(self.sectionHeader, 'crossing-zones')
         self.predictionMethod = config.get(self.sectionHeader, 'prediction-method')
         self.nPredictedTrajectories = config.getint(self.sectionHeader, 'npredicted-trajectories')
-        self.minAcceleration = config.getfloat(self.sectionHeader, 'min-acceleration')/self.videoFrameRate**2
-        self.maxAcceleration = config.getfloat(self.sectionHeader, 'max-acceleration')/self.videoFrameRate**2
-        self.maxSteering = config.getfloat(self.sectionHeader, 'max-steering')/self.videoFrameRate
+        self.maxNormalAcceleration = config.getfloat(self.sectionHeader, 'max-normal-acceleration')/self.videoFrameRate**2
+        self.maxNormalSteering = config.getfloat(self.sectionHeader, 'max-normal-steering')/self.videoFrameRate
+        self.minExtremeAcceleration = config.getfloat(self.sectionHeader, 'min-extreme-acceleration')/self.videoFrameRate**2
+        self.maxExtremeAcceleration = config.getfloat(self.sectionHeader, 'max-extreme-acceleration')/self.videoFrameRate**2
+        self.maxExtremeSteering = config.getfloat(self.sectionHeader, 'max-extreme-steering')/self.videoFrameRate
         self.useFeaturesForPrediction = config.getboolean(self.sectionHeader, 'use-features-prediction')
 
 class SceneParameters: