Peter M. Groen / openbr

Commit 56eb91c54eabd823346c5e1eaa0fb42538aea9a7

Authored by Austin Van Blanton
1 parent 7faec84e

Remove Flatten, dupe of Contract

Inline Side-by-side
Showing 2 changed files with 2 additions and 30 deletions
openbr/plugins/algorithms.cpp
  View file @56eb91c
... ... @@ -50,8 +50,8 @@ class AlgorithmsInitializer : public Initializer
50 50 Globals->abbreviations.insert("PerFrameDetection", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RestoreMat(original)+Draw(inPlace=true),Show(false,[FrameNumber])+Discard])");
51 51 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])");
52 52 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");
53   - Globals->abbreviations.insert("HOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2)+OpticalFlow+Gradient+Bin(0,360,8)+ROI+Hist(8)])+Flatten+CatRows+KMeans(500)+Hist(500)");
54   - 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)");
  53 + Globals->abbreviations.insert("HOF", "Stream([KeyPointDetector(SIFT),AggregateFrames(2)+OpticalFlow+Gradient+Bin(0,360,8)+ROI+Hist(8)])+Contract+CatRows+KMeans(500)+Hist(500)");
  54 + 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)");
55 55  
56 56 // Generic Image Processing
57 57 Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
... ...
openbr/plugins/misc.cpp
  View file @56eb91c
... ... @@ -542,34 +542,6 @@ class EventTransform : public UntrainableMetaTransform
542 542 };
543 543 BR_REGISTER(Transform, EventTransform)
544 544  
545   -/*!
546   - * \ingroup transforms
547   - * \brief Flattens a list of Templates into a single Template
548   - * \author Austin Blanton \cite imaus10
549   - */
550   -class FlattenTransform : public UntrainableMetaTransform
551   -{
552   - Q_OBJECT
553   -
554   - void project(const TemplateList &src, TemplateList &dst) const
555   - {
556   - Template flat;
557   - // let's hope that all Templates belong to the same file
558   - flat.file = src.first().file;
559   - foreach (const Template &tmpl, src)
560   - flat.append(tmpl);
561   - dst.append(flat);
562   - }
563   -
564   - void project(const Template &src, Template &dst) const
565   - {
566   - (void) src;
567   - (void) dst;
568   - qFatal("You shouldn't do that!");
569   - }
570   -};
571   -BR_REGISTER(Transform, FlattenTransform)
572   -
573 545 }
574 546  
575 547 #include "misc.moc"
... ...