changeset 1053:60cc87e824c4

Modifying storage.py [configloaders fixing bugs]
author Wendlasida
date Thu, 05 Jul 2018 22:24:31 -0400
parents 1748c02f9ac3
children d13f9bfbf3ff
files trafficintelligence/storage.py
diffstat 1 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/trafficintelligence/storage.py	Thu Jul 05 13:48:12 2018 -0400
+++ b/trafficintelligence/storage.py	Thu Jul 05 22:24:31 2018 -0400
@@ -1366,36 +1366,36 @@
     
     def loadTrackerConfig(self, filename = None):
         from configparser import ConfigParser
-
-        config = ConfigParser(strict=False)
-        config['DEFAULT']['acceleration-bound'] = '3'
-        config['DEFAULT']['min-velocity-cosine'] = '0.8'
-        config['DEFAULT']['ndisplacements'] = '3'
-        config['DEFAULT']['max-nfeatures'] = '1000'
-        config['DEFAULT']['feature-quality'] = '0.0812219538558'
-        config['DEFAULT']['min-feature-distanceklt'] = '3.54964337411'
-        config['DEFAULT']['block-size'] = '7'
-        config['DEFAULT']['use-harris-detector'] = 'false'
-        config['DEFAULT']['k'] = '0.04'
-        config['DEFAULT']['window-size'] = '6'
-        config['DEFAULT']['pyramid-level'] = '5'
-        config['DEFAULT']['min-tracking-error'] = '0.183328975142'
-        config['DEFAULT']['max-number-iterations'] = '20'
-        config['DEFAULT']['feature-flag'] = '0'
-        config['DEFAULT']['min-feature-eig-threshold'] = '1e-4'
-        config['DEFAULT']['min-feature-time'] = '15'
-        config['DEFAULT']['min-feature-displacement'] = '0.05'
-        config['DEFAULT']['tracker-reload-time'] = '10'
         
-        self.sectionHeader = config.sections()[0]
-        
+        config = ConfigParser({ 'acceleration-bound' : '3', 
+                                'min-velocity-cosine' : '0.8', 
+                                'ndisplacements' : '3', 
+                                'max-nfeatures' : '1000',
+                                'feature-quality' : '0.0812219538558',
+                                'min-feature-distanceklt' : '3.54964337411',
+                                'block-size' : '7',
+                                'use-harris-detector' : '0',
+                                'k' : '0.04',
+                                'window-size' : '6',
+                                'pyramid-level' : '5',
+                                'min-tracking-error' : '0.183328975142',
+                                'max-number-iterations' : '20',
+                                'feature-flag' : '0',
+                                'min-feature-eig-threshold' : '1e-4',
+                                'min-feature-time' : '15',
+                                'min-feature-displacement' : '0.05',
+                                'tracker-reload-time' : '10'}, strict=False)
         if filename is not None:
             config.read_file(addSectionHeader(utils.openCheck(filename)))
+            self.sectionHeader = config.sections()[0]
+        else:
+            self.sectionHeader = 'DEFAULT'
+            
         
         #Tracker parameters
         self.accelerationBound = config.getint(self.sectionHeader, 'acceleration-bound')
         self.minVelocityCosine = config.getfloat(self.sectionHeader, 'min-velocity-cosine')
-        self.ndisplacements = config.getfloat(self.sectionHeader, 'ndisplacements')
+        self.ndisplacements = config.getint(self.sectionHeader, 'ndisplacements')
         self.maxNFeatures = config.getint(self.sectionHeader, 'max-nfeatures')
         self.minFeatureDistanceKLT = config.getfloat(self.sectionHeader, 'min-feature-distanceklt')
         self.featureQuality = config.getfloat(self.sectionHeader, 'feature-quality')