Remove Flatten, dupe of Contract

Austin Van Blanton
1 parent 7faec84e
Showing 2 changed files with 2 additions and 30 deletions
openbr/plugins/algorithms.cpp
openbr/plugins/misc.cpp
@@ -50,8 +50,8 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("PerFrameDetection", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RestoreMat(original)+Draw(inPlace=true),Show(false,[FrameNumber])+Discard])");
         Globals->abbreviations.insert("AgeGenderDemo", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+Expand+<FaceClassificationRegistration>+<FaceClassificationExtraction>+<AgeRegressor>/<GenderClassifier>+Discard+RestoreMat(original)+Draw(inPlace=true)+DrawPropertiesPoint([Age,Gender],Affine_0,inPlace=true)+SaveMat(original)+Discard+Contract,RestoreMat(original)+FPSCalc+Show(false,[AvgFPS,Age,Gender])+Discard])");
         Globals->abbreviations.insert("HOG", "Stream([KeyPointDetector(SIFT)+ROI+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat])+Contract+CatRows+KMeans(500)+Hist(500)+SVM");
-        Globals->abbreviations.insert("HOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2)+OpticalFlow+Gradient+Bin(0,360,8)+ROI+Hist(8)])+Flatten+CatRows+KMeans(500)+Hist(500)");
-        Globals->abbreviations.insert("HOGHOF", "Stream([Cvt(Gray),KeyPointDetector(SIFT),AggregateFrames(2),(OpticalFlow+Gradient+Bin(0,360,8)+ROI+Hist(8))/(First+Gradient+Bin(0,360,8)+ROI+Hist(8)),CatCols])+Flatten+CatRows+KMeans(500)+Hist(500)");
+        Globals->abbreviations.insert("HOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2)+OpticalFlow+Gradient+Bin(0,360,8)+ROI+Hist(8)])+Contract+CatRows+KMeans(500)+Hist(500)");
+        Globals->abbreviations.insert("HOGHOF", "Stream([Cvt(Gray),KeyPointDetector(SIFT),AggregateFrames(2),(OpticalFlow+Gradient+Bin(0,360,8)+ROI+Hist(8))/(First+Gradient+Bin(0,360,8)+ROI+Hist(8)),CatCols])+Contract+CatRows+KMeans(500)+Hist(500)");
         // Generic Image Processing
         Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
@@ -542,34 +542,6 @@ class EventTransform : public UntrainableMetaTransform
 };
 BR_REGISTER(Transform, EventTransform)
-/*!
- * \ingroup transforms
- * \brief Flattens a list of Templates into a single Template
- * \author Austin Blanton \cite imaus10
- */
-class FlattenTransform : public UntrainableMetaTransform
-{
-    Q_OBJECT
-
-    void project(const TemplateList &src, TemplateList &dst) const
-    {
-        Template flat;
-        // let's hope that all Templates belong to the same file
-        flat.file = src.first().file;
-        foreach (const Template &tmpl, src)
-            flat.append(tmpl);
-        dst.append(flat);
-    }
-
-    void project(const Template &src, Template &dst) const
-    {
-        (void) src;
-        (void) dst;
-        qFatal("You shouldn't do that!");
-    }
-};
-BR_REGISTER(Transform, FlattenTransform)
-
 }
 #include "misc.moc"