Commit 848463f882608c127c0f460a676d1cedbd1e85ff
1 parent
5c30c453
Switch back to AggregateFrames in separate step (for speed)
Showing
1 changed file
with
1 additions
and
1 deletions
openbr/plugins/algorithms.cpp
| @@ -52,7 +52,7 @@ class AlgorithmsInitializer : public Initializer | @@ -52,7 +52,7 @@ class AlgorithmsInitializer : public Initializer | ||
| 52 | Globals->abbreviations.insert("BoVW", "Flatten+CatRows+KMeans(500)+Hist(500)"); | 52 | Globals->abbreviations.insert("BoVW", "Flatten+CatRows+KMeans(500)+Hist(500)"); |
| 53 | Globals->abbreviations.insert("HOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2)+OpticalFlow,ROI,HoGDescriptor])+BoVW"); | 53 | Globals->abbreviations.insert("HOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2)+OpticalFlow,ROI,HoGDescriptor])+BoVW"); |
| 54 | Globals->abbreviations.insert("HoG", "Stream([KeyPointDetector(SIFT),ROI,HoGDescriptor])+BoVW"); | 54 | Globals->abbreviations.insert("HoG", "Stream([KeyPointDetector(SIFT),ROI,HoGDescriptor])+BoVW"); |
| 55 | - Globals->abbreviations.insert("HoGHOF", "Stream([KeyPointDetector(SIFT),(AggregateFrames(2)+OpticalFlow+ROI+HoGDescriptor)/(ROI+HoGDescriptor),Cat])+BoVW"); | 55 | + Globals->abbreviations.insert("HoGHOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2),(OpticalFlow+ROI+HoGDescriptor)/(First+ROI+HoGDescriptor),Cat])+BoVW"); |
| 56 | 56 | ||
| 57 | // Generic Image Processing | 57 | // Generic Image Processing |
| 58 | Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)"); | 58 | Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)"); |