FaceRecognition now uses MatchProbabilityDistance

Josh Klontz
1 parent d953599d
Showing 6 changed files with 20 additions and 19 deletions
CHANGELOG.md
app/examples/face_recognition.cpp
sdk/plugins/algorithms.cpp
sdk/plugins/format.cpp
sdk/plugins/quality.cpp
share/openbr/models
-0.2.0 - ??/??/??
+0.2.0 - 2/23/13
 ================
+* FaceRecognition new distance metric
+  - 0 to 1 range indicating match probability
 * Qt 4.8 -> Qt 5.0
 * Cleaner plots generated with 'br -plot'
 * Stasm and FLandmark wrappers
@@ -62,8 +62,9 @@ int main(int argc, char *argv[])
     float comparisonA = distance->compare(target, queryA);
     float comparisonB = distance->compare(target, queryB);
-    printf("Genuine match score: %.3f\n", comparisonA); // Scores above 1 are strong matches
-    printf("Impostor match score: %.3f\n", comparisonB); // Scores below 0.5 are strong non-matches
+    // Scores range from 0 to 1 and represent match probability
+    printf("Genuine match score: %.3f\n", comparisonA);
+    printf("Impostor match score: %.3f\n", comparisonB);
     br::Context::finalize();
     return 0;
@@ -31,7 +31,7 @@ class AlgorithmsInitializer : public Initializer
     void initialize() const
     {
         // Face
-        Globals->abbreviations.insert("FaceRecognition", "FaceDetection!<FaceRecognitionRegistration>!<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>:UCharL1");
+        Globals->abbreviations.insert("FaceRecognition", "FaceDetection!<FaceRecognitionRegistration>!<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>:MatchProbability(ByteL1)");
         Globals->abbreviations.insert("FaceRecognitionNoTraining", "FaceDetection!ASEFEyes+Affine(86,86,0.25,0.35)!Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+Mask+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59)+Cat:ChiSquared");
         Globals->abbreviations.insert("GenderClassification", "FaceDetection!<FaceClassificationRegistration>!<FaceClassificationExtraction>+<GenderClassifier>+Discard");
         Globals->abbreviations.insert("AgeRegression", "FaceDetection!<FaceClassificationRegistration>!<FaceClassificationExtraction>+<AgeRegressor>+Discard");
@@ -222,7 +222,6 @@ class DefaultFormat : public Format
                     fileName = file.fileName();
                     if (!QFileInfo(fileName).exists()) {
                         fileName = file.getString("path") + "/" + file.fileName();
-                        qDebug() << fileName;
                         if (!QFileInfo(fileName).exists()) return t;
                     }
                 }
@@ -147,13 +147,11 @@ class MatchProbabilityDistance : public Distance
 {
     Q_OBJECT
     Q_PROPERTY(br::Distance* distance READ get_distance WRITE set_distance RESET reset_distance STORED false)
-    Q_PROPERTY(QString binKey READ get_binKey WRITE set_binKey RESET reset_binKey STORED false)
     Q_PROPERTY(bool gaussian READ get_gaussian WRITE set_gaussian RESET reset_gaussian STORED false)
     BR_PROPERTY(br::Distance*, distance, make("Dist(L2)"))
-    BR_PROPERTY(QString, binKey, "")
     BR_PROPERTY(bool, gaussian, true)
-    QHash<QString, MP> mps;
+    MP mp;
     void train(const TemplateList &src)
     {
@@ -163,37 +161,38 @@ class MatchProbabilityDistance : public Distance
         QScopedPointer<MatrixOutput> memoryOutput(dynamic_cast<MatrixOutput*>(Output::make(".Matrix", FileList(src.size()), FileList(src.size()))));
         distance->compare(src, src, memoryOutput.data());
-        QHash< QString, QList<float> > genuineScores, impostorScores;
-        for (int i=0; i<src.size(); i++)
+        QList<float> genuineScores, impostorScores;
+        genuineScores.reserve(labels.size());
+        impostorScores.reserve(labels.size()*labels.size());
+        for (int i=0; i<src.size(); i++) {
             for (int j=0; j<i; j++) {
                 const float score = memoryOutput.data()->data.at<float>(i, j);
                 if (score == -std::numeric_limits<float>::max()) continue;
-                const QString bin = src[i].file.getString(binKey, "");
-                if (labels[i] == labels[j]) genuineScores[bin].append(score);
-                else                        impostorScores[bin].append(score);
+                if (labels[i] == labels[j]) genuineScores.append(score);
+                else                        impostorScores.append(score);
             }
+        }
-        foreach (const QString &key, genuineScores.keys())
-            mps.insert(key, MP(genuineScores[key], impostorScores[key]));
+        mp = MP(genuineScores, impostorScores);
     }
     float compare(const Template &target, const Template &query) const
     {
         float rawScore = distance->compare(target, query);
         if (rawScore == -std::numeric_limits<float>::max()) return rawScore;
-        return mps[query.file.getString(binKey, "")](rawScore, gaussian);
+        return mp(rawScore, gaussian);
     }
     void store(QDataStream &stream) const
     {
         distance->store(stream);
-        stream << mps;
+        stream << mp;
     }
     void load(QDataStream &stream)
     {
         distance->load(stream);
-        stream >> mps;
+        stream >> mp;
     }
 };
-Subproject commit b560a337e5b47770234d4ab554c563b5043e3595
+Subproject commit 3ab0a438e4d93ead1a7db346d221bbb4ae81ccf1