Mercurial Hosting > traffic-intelligence
comparison scripts/classify-objects.py @ 893:ff92801e5c54
updated hog to scikit-image 0.13 (needed to add a block_norm attribute in classifier.cfg)
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 30 May 2017 16:10:18 -0400 |
parents | 33d296984dd8 |
children | 1fc901d983ed |
comparison
equal
deleted
inserted
replaced
892:f766fe0995f4 | 893:ff92801e5c54 |
---|---|
115 currentObjects.append(obj) | 115 currentObjects.append(obj) |
116 elif inter.last == frameNum: | 116 elif inter.last == frameNum: |
117 obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = classifierParams.minSpeedEquiprobable, speedProbabilities = speedProbabilities) | 117 obj.classifyUserTypeHoGSVM(minSpeedEquiprobable = classifierParams.minSpeedEquiprobable, speedProbabilities = speedProbabilities) |
118 pastObjects.append(obj) | 118 pastObjects.append(obj) |
119 else: | 119 else: |
120 obj.classifyUserTypeHoGSVMAtInstant(img, frameNum, invHomography, width, height, classifierParams.percentIncreaseCrop, classifierParams.percentIncreaseCrop, classifierParams.minNPixels, classifierParams.hogRescaleSize, classifierParams.hogNOrientations, classifierParams.hogNPixelsPerCell, classifierParams.hogNCellsPerBlock) | 120 obj.classifyUserTypeHoGSVMAtInstant(img, frameNum, invHomography, width, height, classifierParams.percentIncreaseCrop, classifierParams.percentIncreaseCrop, classifierParams.minNPixels, classifierParams.hogRescaleSize, classifierParams.hogNOrientations, classifierParams.hogNPixelsPerCell, classifierParams.hogNCellsPerBlock, classifierParams.hogBlockNorm) |
121 currentObjects.append(obj) | 121 currentObjects.append(obj) |
122 else: | 122 else: |
123 currentObjects.append(obj) | 123 currentObjects.append(obj) |
124 objects = currentObjects | 124 objects = currentObjects |
125 frameNum += 1 | 125 frameNum += 1 |