Mercurial Hosting > traffic-intelligence
changeset 536:95276d310972
renamed TrackingParameters to ProcessParameters
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Wed, 02 Jul 2014 11:35:05 -0400 |
| parents | 5ad2f51ae42f |
| children | 6c264b914846 |
| files | python/storage.py scripts/classify-objects.py scripts/display-trajectories.py scripts/safety-analysis.py |
| diffstat | 4 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/python/storage.py Sun Jun 29 23:31:38 2014 -0400 +++ b/python/storage.py Wed Jul 02 11:35:05 2014 -0400 @@ -557,8 +557,8 @@ # Utils to read .ini type text files for configuration, meta data... ######################### -class TrackingParameters: - '''Class for tracking and safety parameters +class ProcessParameters: + '''Class for all parameters controlling data processing: input, method parameters, etc. for tracking, classification and safety Note: framerate is already taken into account'''
--- a/scripts/classify-objects.py Sun Jun 29 23:31:38 2014 -0400 +++ b/scripts/classify-objects.py Wed Jul 02 11:35:05 2014 -0400 @@ -7,8 +7,9 @@ import cvutils, moving, ml parser = argparse.ArgumentParser(description='The program processes indicators for all pairs of road users in the scene') +parser.add_argument('--cfg', dest = 'configFilename', help = 'name of the configuration file', required = True) parser.add_argument('-d', dest = 'directoryName', help = 'name of the parent directory containing the videos and extracted trajectories to process', required = True) -parser.add_argument('-o', dest = 'homographyFilename', help = 'name of the image to world homography file') +# parser.add_argument('-o', dest = 'homographyFilename', help = 'name of the image to world homography file') # need a classification config file for speed distribution parameters, svm models, frequency parameters, area parameters etc #parser.add_argument('--cfg', dest = 'svmType', help = 'SVM type', default = SVM_C_SVC, type = long) @@ -17,6 +18,6 @@ #parser.add_argument('-o', dest = 'nOrientations', help = 'number of orientations in HoG', default = 9, type = int) #parser.add_argument('-p', dest = 'nPixelsPerCell', help = 'number of pixels per cell', default = 8, type = int) #parser.add_argument('-c', dest = 'nCellsPerBlock', help = 'number of cells per block', default = 2, type = int) + args = parser.parse_args() - -print('TODO') # add all parameters for classification (distribution parameters) +params = storage.ProcessParameters(args.configFilename)
--- a/scripts/display-trajectories.py Sun Jun 29 23:31:38 2014 -0400 +++ b/scripts/display-trajectories.py Wed Jul 02 11:35:05 2014 -0400 @@ -26,7 +26,7 @@ args = parser.parse_args() if args.configFilename: # consider there is a configuration file - params = storage.TrackingParameters(args.configFilename) + params = storage.ProcessParameters(args.configFilename) videoFilename = params.videoFilename databaseFilename = params.databaseFilename if params.homography != None:
--- a/scripts/safety-analysis.py Sun Jun 29 23:31:38 2014 -0400 +++ b/scripts/safety-analysis.py Wed Jul 02 11:35:05 2014 -0400 @@ -16,8 +16,7 @@ parser.add_argument('--display-cp', dest = 'displayCollisionPoints', help = 'display collision points', action = 'store_true') args = parser.parse_args() -params = storage.TrackingParameters() -params.loadConfigFile(args.configFilename) +params = storage.ProcessParameters(args.configFilename) # parameters for prediction methods if args.predictionMethod: