Commit 4dd80ff877a8790ede3be8681c57f9e290282a01
1 parent
2899faf7
dropped DFFS
Showing
2 changed files
with
0 additions
and
50 deletions
openbr/plugins/classification/lda.cpp
| @@ -55,7 +55,6 @@ BR_REGISTER(Initializer, EigenInitializer) | @@ -55,7 +55,6 @@ BR_REGISTER(Initializer, EigenInitializer) | ||
| 55 | class PCATransform : public Transform | 55 | class PCATransform : public Transform |
| 56 | { | 56 | { |
| 57 | Q_OBJECT | 57 | Q_OBJECT |
| 58 | - friend class DFFSTransform; | ||
| 59 | friend class LDATransform; | 58 | friend class LDATransform; |
| 60 | 59 | ||
| 61 | protected: | 60 | protected: |
| @@ -221,54 +220,6 @@ BR_REGISTER(Transform, PCATransform) | @@ -221,54 +220,6 @@ BR_REGISTER(Transform, PCATransform) | ||
| 221 | 220 | ||
| 222 | /*! | 221 | /*! |
| 223 | * \ingroup transforms | 222 | * \ingroup transforms |
| 224 | - * \brief Computes Distance From Feature Space (DFFS) | ||
| 225 | - * \br_paper Moghaddam, Baback, and Alex Pentland. | ||
| 226 | - * "Probabilistic visual learning for object representation." | ||
| 227 | - * Pattern Analysis and Machine Intelligence, IEEE Transactions on 19.7 (1997): 696-710. | ||
| 228 | - * \author Josh Klontz \cite jklontz | ||
| 229 | - * \br_property float keep Sets PCA keep property. Default is 0.95. | ||
| 230 | - */ | ||
| 231 | -class DFFSTransform : public Transform | ||
| 232 | -{ | ||
| 233 | - Q_OBJECT | ||
| 234 | - Q_PROPERTY(float keep READ get_keep WRITE set_keep RESET reset_keep STORED false) | ||
| 235 | - BR_PROPERTY(float, keep, 0.95) | ||
| 236 | - | ||
| 237 | - PCATransform pca; | ||
| 238 | - Transform *cvtFloat; | ||
| 239 | - | ||
| 240 | - void init() | ||
| 241 | - { | ||
| 242 | - pca.keep = keep; | ||
| 243 | - cvtFloat = make("CvtFloat"); | ||
| 244 | - } | ||
| 245 | - | ||
| 246 | - void train(const TemplateList &data) | ||
| 247 | - { | ||
| 248 | - pca.train((*cvtFloat)(data)); | ||
| 249 | - } | ||
| 250 | - | ||
| 251 | - void project(const Template &src, Template &dst) const | ||
| 252 | - { | ||
| 253 | - dst = src; | ||
| 254 | - dst.file.set("DFFS", sqrt(pca.residualReconstructionError((*cvtFloat)(src)))); | ||
| 255 | - } | ||
| 256 | - | ||
| 257 | - void store(QDataStream &stream) const | ||
| 258 | - { | ||
| 259 | - pca.store(stream); | ||
| 260 | - } | ||
| 261 | - | ||
| 262 | - void load(QDataStream &stream) | ||
| 263 | - { | ||
| 264 | - pca.load(stream); | ||
| 265 | - } | ||
| 266 | -}; | ||
| 267 | - | ||
| 268 | -BR_REGISTER(Transform, DFFSTransform) | ||
| 269 | - | ||
| 270 | -/*! | ||
| 271 | - * \ingroup transforms | ||
| 272 | * \brief Projects input into learned Linear Discriminant Analysis subspace. | 223 | * \brief Projects input into learned Linear Discriminant Analysis subspace. |
| 273 | * \author Brendan Klare \cite bklare | 224 | * \author Brendan Klare \cite bklare |
| 274 | * \author Josh Klontz \cite jklontz | 225 | * \author Josh Klontz \cite jklontz |
openbr/plugins/core/algorithms.cpp
| @@ -34,7 +34,6 @@ class AlgorithmsInitializer : public Initializer | @@ -34,7 +34,6 @@ class AlgorithmsInitializer : public Initializer | ||
| 34 | Globals->abbreviations.insert("FaceRecognition", "FaceDetection+FaceRecognitionRegistration+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>+SetMetadata(AlgorithmID,-1):Unit(ByteL1)"); | 34 | Globals->abbreviations.insert("FaceRecognition", "FaceDetection+FaceRecognitionRegistration+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>+SetMetadata(AlgorithmID,-1):Unit(ByteL1)"); |
| 35 | Globals->abbreviations.insert("GenderClassification", "FaceDetection+Expand+FaceClassificationRegistration+Expand+<FaceClassificationExtraction>+<GenderClassifier>+Discard"); | 35 | Globals->abbreviations.insert("GenderClassification", "FaceDetection+Expand+FaceClassificationRegistration+Expand+<FaceClassificationExtraction>+<GenderClassifier>+Discard"); |
| 36 | Globals->abbreviations.insert("AgeRegression", "FaceDetection+Expand+FaceClassificationRegistration+Expand+<FaceClassificationExtraction>+<AgeRegressor>+Discard"); | 36 | Globals->abbreviations.insert("AgeRegression", "FaceDetection+Expand+FaceClassificationRegistration+Expand+<FaceClassificationExtraction>+<AgeRegressor>+Discard"); |
| 37 | - Globals->abbreviations.insert("FaceQuality", "Open+Expand+Cascade(FrontalFace)+ASEFEyes+Affine(64,64,0.25,0.35)+ImageQuality+Cvt(Gray)+DFFS+Discard"); | ||
| 38 | Globals->abbreviations.insert("MedianFace", "Open+Expand+Cascade(FrontalFace)+ASEFEyes+Affine(256,256,0.37,0.45)+Center(Median)"); | 37 | Globals->abbreviations.insert("MedianFace", "Open+Expand+Cascade(FrontalFace)+ASEFEyes+Affine(256,256,0.37,0.45)+Center(Median)"); |
| 39 | Globals->abbreviations.insert("BlurredFaceDetection", "Open+LimitSize(1024)+SkinMask/(Cvt(Gray)+GradientMask)+And+Morph(Erode,16)+LargestConvexArea"); | 38 | Globals->abbreviations.insert("BlurredFaceDetection", "Open+LimitSize(1024)+SkinMask/(Cvt(Gray)+GradientMask)+And+Morph(Erode,16)+LargestConvexArea"); |
| 40 | Globals->abbreviations.insert("DrawFaceDetection", "Open+Cascade(FrontalFace)+Expand+ASEFEyes+Draw(inPlace=true)"); | 39 | Globals->abbreviations.insert("DrawFaceDetection", "Open+Cascade(FrontalFace)+Expand+ASEFEyes+Draw(inPlace=true)"); |