Merge branch 'master' of https://github.com/biometrics/openbr into serialization_update

Charles Otto
2 parents b78b07b2 496bc87c
Showing 8 changed files with 47 additions and 20 deletions
openbr/core/eval.cpp
openbr/core/plot.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/algorithms.cpp
openbr/plugins/crop.cpp
openbr/plugins/gallery.cpp
openbr/universal_template.h
@@ -605,10 +605,10 @@ struct ResolvedDetection
 struct DetectionOperatingPoint
 {
-    float Recall, FalsePositives, Precision;
-    DetectionOperatingPoint() : Recall(-1), FalsePositives(-1), Precision(-1) {}
+    float Recall, FalsePositiveRate, Precision;
+    DetectionOperatingPoint() : Recall(-1), FalsePositiveRate(-1), Precision(-1) {}
     DetectionOperatingPoint(float TP, float FP, float totalPositives)
-        : Recall(TP/totalPositives), FalsePositives(FP), Precision(TP/(TP+FP)) {}
+        : Recall(TP/totalPositives), FalsePositiveRate(FP/totalPositives), Precision(TP/(TP+FP)) {}
 };
 static QStringList computeDetectionResults(const QList<ResolvedDetection> &detections, int totalTrueDetections, bool discrete)
@@ -639,12 +639,12 @@ static QStringList computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;detec
     QStringList lines; lines.reserve(keep);
     if (keep == 1) {
         const DetectionOperatingPoint &point = points[0];
-        lines.append(QString("%1ROC, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.FalsePositives), QString::number(point.Recall)));
+        lines.append(QString("%1ROC, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.FalsePositiveRate), QString::number(point.Recall)));
         lines.append(QString("%1PR, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.Recall), QString::number(point.Precision)));
     } else {
         for (int i=0; i<keep; i++) {
             const DetectionOperatingPoint &point = points[double(i) / double(keep-1) * double(points.size()-1)];
-            lines.append(QString("%1ROC, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.FalsePositives), QString::number(point.Recall)));
+            lines.append(QString("%1ROC, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.FalsePositiveRate), QString::number(point.Recall)));
             lines.append(QString("%1PR, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.Recall), QString::number(point.Precision)));
         }
     }
@@ -350,10 +350,10 @@ bool PlotDetection(const QStringList &amp;files, const File &amp;destination, bool show)
         p.file.write(qPrintable(QString("qplot(X, Y, data=%1ROC%2").arg(type, (p.major.smooth || p.minor.smooth) ? ", geom=\"smooth\", method=loess, level=0.99" : QString(", geom=\"%1\"").arg(plotType)) +
                                 (p.major.size > 1 ? QString(", colour=factor(%1)").arg(p.major.header) : QString()) +
                                 (p.minor.size > 1 ? QString(", linetype=factor(%1)").arg(p.minor.header) : QString()) +
-                                QString(", xlab=\"False Accepts\", ylab=\"True Accept Rate\") + theme_minimal()") +
+                                QString(", xlab=\"Percentage of False Accepts Per Image\", ylab=\"True Accept Rate\") + theme_minimal()") +
                                 (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) +
                                 (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
-                                QString(" + scale_x_log10() + scale_y_continuous(labels=percent) + annotation_logticks(sides=\"b\") + ggtitle(\"%1\")\n\n").arg(type)));
+                                QString(" + scale_x_log10(labels=percent) + scale_y_continuous(labels=percent, limits=c(0,1)) + annotation_logticks(sides=\"b\") + ggtitle(\"%1\") + theme(legend.position=\"bottom\")\n\n").arg(type)));
     foreach (const QString &type, QStringList() << "Discrete" << "Continuous")
         p.file.write(qPrintable(QString("qplot(X, Y, data=%1PR%2").arg(type, (p.major.smooth || p.minor.smooth) ? ", geom=\"smooth\", method=loess, level=0.99" : QString(", geom=\"%1\"").arg(plotType)) +
@@ -362,12 +362,12 @@ bool PlotDetection(const QStringList &amp;files, const File &amp;destination, bool show)
                                 QString(", xlab=\"Recall\", ylab=\"Precision\") + theme_minimal()") +
                                 (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) +
                                 (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
-                                QString(" + scale_x_continuous(labels=percent) + scale_y_continuous(labels=percent) + ggtitle(\"%1\")\n\n").arg(type)));
+                                QString(" + scale_x_continuous(labels=percent, limits=c(0,1)) + scale_y_continuous(labels=percent, limits=c(0,1)) + ggtitle(\"%1\") + theme(legend.position=\"bottom\")\n\n").arg(type)));
     p.file.write(qPrintable(QString("qplot(X, data=Overlap, geom=\"histogram\", position=\"identity\", xlab=\"Overlap\", ylab=\"Frequency\")") +
                             QString(" + theme_minimal() + scale_x_continuous(minor_breaks=NULL) + scale_y_continuous(minor_breaks=NULL) + theme(axis.text.y=element_blank(), axis.ticks=element_blank(), axis.text.x=element_text(angle=-90, hjust=0))") +
                             (p.major.size > 1 ? (p.minor.size > 1 ? QString(" + facet_grid(%2 ~ %1, scales=\"free\")").arg(p.minor.header, p.major.header) : QString(" + facet_wrap(~ %1, scales = \"free\")").arg(p.major.header)) : QString()) +
-                            QString(" + theme(aspect.ratio=1)\n\n")));
+                            QString(" + theme(aspect.ratio=1, legend.position=\"bottom\")\n\n")));
     p.file.write(qPrintable(QString("ggplot(AverageOverlap, aes(x=%1, y=%2, label=round(X,3)), main=\"Average Overlap\") + geom_text() + theme_minimal()").arg(p.minor.size > 1 ? p.minor.header : "'X'", p.major.size > 1 ? p.major.header : "'Y'") +
                             QString("%1%2\n\n").arg(p.minor.size > 1 ? "" : " + xlab(NULL)", p.major.size > 1 ? "" : " + ylab(NULL)")));
@@ -126,6 +126,14 @@ bool File::contains(const QString &amp;key) const
     return m_metadata.contains(key) || Globals->contains(key) || key == "name";
 }
+bool File::contains(const QStringList &keys) const
+{
+    foreach (const QString &key, keys)
+        if (!contains(key))
+            return false;
+    return true;
+}
+
 QVariant File::value(const QString &key) const
 {
     return m_metadata.contains(key) ? m_metadata.value(key) : (key == "name" ? name : Globals->property(qPrintable(key)));
@@ -213,6 +213,7 @@ struct BR_EXPORT File
     QString resolved() const; /*!< \brief Returns name prepended with Globals->path if name does not exist. */
     bool contains(const QString &key) const; /*!< \brief Returns \c true if the key has an associated value, \c false otherwise. */
+    bool contains(const QStringList &keys) const; /*!< \brief Returns \c true if all keys have associated values, \c false otherwise. */
     QVariant value(const QString &key) const; /*!< \brief Returns the value for the specified key. */
     static QVariant parse(const QString &value); /*!< \brief Try to convert the QString to a QPointF or QRectF if possible. */
     inline void set(const QString &key, const QVariant &value) { m_metadata.insert(key, value); } /*!< \brief Insert or overwrite the metadata key with the specified value. */
@@ -39,7 +39,7 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("BlurredFaceDetection", "Open+LimitSize(1024)+SkinMask/(Cvt(Gray)+GradientMask)+And+Morph(Erode,16)+LargestConvexArea");
         Globals->abbreviations.insert("DrawFaceDetection", "Open+Cascade(FrontalFace)+Expand+ASEFEyes+Draw");
         Globals->abbreviations.insert("ShowFaceDetection", "DrawFaceDetection+Expand+Show");
-        Globals->abbreviations.insert("DownloadFaceRecognition", "Download+Expand+FaceDetection+Expand+<FaceRecognitionRegistration>+Expand+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>+SetMetadata(AlgorithmID,-1):MatchProbability(ByteL1)");
+        Globals->abbreviations.insert("DownloadFaceRecognition", "Download+Open+ROI+Expand+Cvt(Gray)+Cascade(FrontalFace)+Expand+<FaceRecognitionRegistration>+Expand+<FaceRecognitionExtraction>+<FaceRecognitionEmbedding>+<FaceRecognitionQuantization>+SetMetadata(AlgorithmID,-1):MatchProbability(ByteL1)");
         Globals->abbreviations.insert("OpenBR", "FaceRecognition");
         Globals->abbreviations.insert("GenderEstimation", "GenderClassification");
         Globals->abbreviations.insert("AgeEstimation", "AgeRegression");
@@ -55,9 +55,9 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("ShowOpticalFlowMagnitude", "Stream(AggregateFrames(2)+OpticalFlow+Normalize(Range,false,0,255)+Cvt(Color)+Draw+FPSLimit(30)+Show(false)+Discard)");
         Globals->abbreviations.insert("ShowMotionSegmentation", "Stream(DropFrames(5)+AggregateFrames(2)+OpticalFlow+CvtUChar+WatershedSegmentation+DrawSegmentation+Draw+FPSLimit(30)+Show(false)+Discard)");
-        Globals->abbreviations.insert("HOG", "Stream(DropFrames(5)+Cvt(Gray)+Grid(5,5)+ROIFromPts(32,24)+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(DropFrames(5)+Grid(5,5)+AggregateFrames(2)+OpticalFlow+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat)+Contract+CatRows+KMeans(500)+Hist(500)");
-        Globals->abbreviations.insert("HOGHOF", "Stream(DropFrames(5)+Grid(5,5)+AggregateFrames(2)+(OpticalFlow+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat+Contract)/(First+Cvt(Gray)+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat+Contract)+CatCols)+Contract+CatRows+KMeans(500)+Hist(500)+SVM");
+        Globals->abbreviations.insert("HOGVideo", "Stream(DropFrames(5)+Cvt(Gray)+Grid(5,5)+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat)+Contract+CatRows+KMeans(500)+Hist(500)+SVM");
+        Globals->abbreviations.insert("HOFVideo", "Stream(DropFrames(5)+Grid(5,5)+AggregateFrames(2)+OpticalFlow+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat)+Contract+CatRows+KMeans(500)+Hist(500)");
+        Globals->abbreviations.insert("HOGHOFVideo", "Stream(DropFrames(5)+Grid(5,5)+AggregateFrames(2)+(OpticalFlow+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat+Contract)/(First+Cvt(Gray)+ROIFromPts(32,24)+Expand+Resize(32,32)+Gradient+RectRegions+Bin(0,360,8)+Hist(8)+Cat+Contract)+CatCols)+Contract+CatRows+KMeans(500)+Hist(500)+SVM");
         // Generic Image Processing
         Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
@@ -83,6 +83,7 @@ class AlgorithmsInitializer : public Initializer
         // Transforms
         Globals->abbreviations.insert("FaceDetection", "Open+Cvt(Gray)+Cascade(FrontalFace)");
         Globals->abbreviations.insert("DenseLBP", "(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))");
+        Globals->abbreviations.insert("DenseHOG", "Gradient+RectRegions(8,8,6,6)+Bin(0,360,8)+Hist(8)");
         Globals->abbreviations.insert("DenseSIFT", "(Grid(10,10)+SIFTDescriptor(12)+ByRow)");
         Globals->abbreviations.insert("DenseSIFT2", "(Grid(5,5)+SIFTDescriptor(12)+ByRow)");
         Globals->abbreviations.insert("FaceRecognitionRegistration", "(ASEFEyes+Affine(88,88,0.25,0.35)+DownsampleTraining(FTE(DFFS),instances=1))");
@@ -65,14 +65,19 @@ class ROITransform : public UntrainableTransform
         if (!propName.isEmpty()) {
             QRectF rect = src.file.get<QRectF>(propName);
             dst += src.m()(OpenCVUtils::toRect(rect));
-        }
-        else if (src.file.rects().empty()) {
-            dst = src;
-            if (Globals->verbose) qWarning("No rects present in file.");
-        }
-        else
+        } else if (!src.file.rects().empty()) {
             foreach (const QRectF &rect, src.file.rects())
                 dst += src.m()(OpenCVUtils::toRect(rect));
+        } else if (src.file.contains(QStringList() << "X" << "Y" << "Width" << "Height")) {
+            dst += src.m()(Rect(src.file.get<int>("X"),
+                                src.file.get<int>("Y"),
+                                src.file.get<int>("Width"),
+                                src.file.get<int>("Height")));
+        } else {
+            dst = src;
+            if (Globals->verbose)
+                qWarning("No rects present in file.");
+        }
     }
 };
@@ -225,6 +225,13 @@ class utGallery : public BinaryGallery
             if (ut.algorithmID == 5) {
                 QDataStream stream(&data, QIODevice::ReadOnly);
                 stream >> t;
+            } else if (ut.algorithmID == 7) {
+                uint32_t *roi = (uint32_t*) data.data();
+                t.file.set("X", roi[0]);
+                t.file.set("Y", roi[1]);
+                t.file.set("Width", roi[2]);
+                t.file.set("Height", roi[3]);
+                t.append(cv::Mat(1, data.size()-4*sizeof(uint32_t), CV_8UC1, data.data()+4*sizeof(uint32_t)).clone() /* We don't want a shallow copy! */);
             } else {
                 t.append(cv::Mat(1, data.size(), CV_8UC1, data.data()).clone() /* We don't want a shallow copy! */);
             }
@@ -357,7 +364,7 @@ class jsonGallery : public BinaryGallery
         QJsonParseError error;
         File file = QJsonDocument::fromJson(gallery.readLine(), &error).object().toVariantMap();
         if (error.error != QJsonParseError::NoError)
-            qDebug() << error.errorString();
+            qFatal("%s\n", qPrintable(error.errorString()));
         return file;
     }
@@ -25,6 +25,11 @@
 extern "C" {
 #endif
+// Disable 'nonstandard extension used : zero-sized array in struct/union' warning
+#ifdef _MSC_VER
+#  pragma warning(disable: 4200)
+#endif // _MSC_VER
+
 /*!
  * \brief A flat template format for representing arbitrary feature vectors.
  */