Mercurial Hosting > traffic-intelligence

diff scripts/classify-objects.py @ 899:1466a63dd1cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added a new classification parameter
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 21 Jun 2017 17:44:09 -0400
parents 1fc901d983ed
children 753a081989e2
line wrap: on
line diff
--- a/scripts/classify-objects.py	Wed Jun 21 17:21:03 2017 -0400
+++ b/scripts/classify-objects.py	Wed Jun 21 17:44:09 2017 -0400
@@ -114,7 +114,7 @@
                         obj.initClassifyUserTypeHoGSVM(speedAggregationFunc, pedBikeCarSVM, bikeCarSVM, classifierParams.maxPedestrianSpeed, classifierParams.maxCyclistSpeed, classifierParams.nFramesIgnoreAtEnds)
                         currentObjects.append(obj)
                     elif inter.last == frameNum:
-                        obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = classifierParams.minSpeedEquiprobable, speedProbabilities = speedProbabilities, maxPercentUnknown = 0.5) # todo add maxPercentUnknown in cfg
+                        obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = classifierParams.minSpeedEquiprobable, speedProbabilities = speedProbabilities, maxPercentUnknown = classifierParams.maxPercentUnknown)
                         pastObjects.append(obj)
                     else:
                         obj.classifyUserTypeHoGSVMAtInstant(img, frameNum, invHomography, width, height, classifierParams.percentIncreaseCrop, classifierParams.percentIncreaseCrop, classifierParams.minNPixels, classifierParams.hogRescaleSize, classifierParams.hogNOrientations, classifierParams.hogNPixelsPerCell, classifierParams.hogNCellsPerBlock, classifierParams.hogBlockNorm)
@@ -125,7 +125,7 @@
         frameNum += 1
     
     for obj in objects:
-        obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = classifierParams.minSpeedEquiprobable, speedProbabilities = speedProbabilities)
+        obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = classifierParams.minSpeedEquiprobable, speedProbabilities = speedProbabilities, maxPercentUnknown = classifierParams.maxPercentUnknown)
         pastObjects.append(obj)
     print('Saving user types')
     storage.setRoadUserTypes(databaseFilename, pastObjects)