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

Scott Klum
2 parents 0ca4f874 7d79754e
Showing 8 changed files with 77 additions and 3 deletions
CHANGELOG.md
openbr/core/eval.cpp
openbr/core/plot.cpp
openbr/openbr.h
openbr/openbr_plugin.cpp
openbr/plugins/frames.cpp
openbr/plugins/independent.cpp
scripts/downloadDatasets.sh
 0.4.0 - ??/??/??
 ================
+* Added -evalDetection and -plotDetection for evaluating and plotting object detection accuracy (#9)
  
 0.3.0 - 5/22/13
 ===============
@@ -380,7 +380,7 @@ static QStringList computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;detec
     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("%1PR, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.Precision), QString::number(point.Recall)));
+        lines.append(QString("%1PR, %2, %3").arg(discrete ? "Discrete" : "Continuous", QString::number(point.Recall), QString::number(point.Precision)));
     }
     return lines;
 }
@@ -238,7 +238,6 @@ bool Plot(const QStringList &amp;files, const File &amp;destination, bool show)
                             (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
                             QString(" + scale_x_log10(labels=percent) + scale_y_log10(labels=percent) + annotation_logticks()\n\n")));
  
-
     p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") +
                             QString(", xlab=\"Score%1\"").arg((p.flip ? p.major.size : p.minor.size) > 1 ? " / " + (p.flip ? p.major.header : p.minor.header) : QString()) +
                             QString(", ylab=\"Frequency%1\"").arg((p.flip ? p.minor.size : p.major.size) > 1 ? " / " + (p.flip ? p.minor.header : p.major.header) : QString()) +
@@ -278,6 +277,39 @@ bool PlotDetection(const QStringList &amp;files, const File &amp;destination, bool show)
  
     RPlot p(files, destination, false);
  
+    p.file.write("# Split data into individual plots\n"
+                 "plot_index = which(names(data)==\"Plot\")\n"
+                 "DiscreteROC <- data[grep(\"DiscreteROC\",data$Plot),-c(1)]\n"
+                 "ContinuousROC <- data[grep(\"ContinuousROC\",data$Plot),-c(1)]\n"
+                 "DiscretePR <- data[grep(\"DiscretePR\",data$Plot),-c(1)]\n"
+                 "ContinuousPR <- data[grep(\"ContinuousPR\",data$Plot),-c(1)]\n"
+                 "Overlap <- data[grep(\"Overlap\",data$Plot),-c(1)]\n"
+                 "rm(data)\n"
+                 "\n");
+
+    foreach (const QString &type, QStringList() << "Discrete" << "Continuous")
+        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" : ", geom=\"line\"") +
+                                (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()") +
+                                (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)));
+
+    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" : ", geom=\"line\"") +
+                                (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=\"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)));
+
+    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")));
+
     return p.finalize(show);
 }
  
@@ -268,6 +268,18 @@ BR_EXPORT bool br_plot(int num_files, const char *files[], const char *destinati
  
 /*!
  * \brief Renders detection performance figures for a set of <tt>.csv</tt> files created by \ref br_eval_detection.
+ *
+ * In order of their output, the figures are:
+ * -# Discrete Receiver Operating Characteristic (DiscreteROC)
+ * -# Continuous Receiver Operating Characteristic (ContinuousROC)
+ * -# Discrete Precision Recall (DiscretePR)
+ * -# Continuous Precision Recall (ContinuousPR)
+ * -# Bounding Box Overlap Histogram (Overlap)
+ *
+ * Detection accuracy is measured with <i>overlap fraction = bounding box intersection / union</i>.
+ * When computing <i>discrete</i> curves, an overlap >= 0.5 is considered a true positive, otherwise it is considered a false negative.
+ * When computing <i>continuous</i> curves, true positives and false negatives are measured fractionally as <i>overlap</i> and <i>1-overlap</i> respectively.
+ *
  * \see br_plot
  */
 BR_EXPORT bool br_plot_detection(int num_files, const char *files[], const char *destination, bool show = false);
@@ -1166,7 +1166,8 @@ void Transform::project(const TemplateList &amp;src, TemplateList &amp;dst) const
         dst.append(Template());
     QFutureSynchronizer<void> futures;
     for (int i=0; i<dst.size(); i++)
-        futures.addFuture(QtConcurrent::run(_project, this, &src[i], &dst[i]));
+        if (Globals->parallelism > 1) futures.addFuture(QtConcurrent::run(_project, this, &src[i], &dst[i]));
+        else                          _project(this, &src[i], &dst[i]);
     futures.waitForFinished();
 }
  
@@ -18,6 +18,10 @@ class AggregateFrames : public TimeVaryingTransform
  
     TemplateList buffer;
  
+public:
+    AggregateFrames() : TimeVaryingTransform(false) {}
+
+private:
     void train(const TemplateList &data)
     {
         (void) data;
@@ -99,6 +99,8 @@ class IndependentTransform : public MetaTransform
         return independentTransform;
     }
  
+    bool timeVarying() const { return transform->timeVarying(); }
+
     static void _train(Transform *transform, const TemplateList *data)
     {
         transform->train(*data);
@@ -143,6 +145,27 @@ class IndependentTransform : public MetaTransform
         dst.append(mats);
     }
  
+    void projectUpdate(const Template &src, Template &dst)
+    {
+        dst.file = src.file;
+        QList<Mat> mats;
+        for (int i=0; i<src.size(); i++) {
+            transforms[i%transforms.size()]->projectUpdate(Template(src.file, src[i]), dst);
+            mats.append(dst);
+            dst.clear();
+        }
+        dst.append(mats);
+    }
+
+    void projectUpdate(const TemplateList &src, TemplateList &dst)
+    {
+        dst.reserve(src.size());
+        foreach (const Template &t, src) {
+            dst.append(Template());
+            projectUpdate(t, dst.last());
+        }
+    }
+
     void store(QDataStream &stream) const
     {
         const int size = transforms.size();
@@ -64,5 +64,6 @@ if [ ! -d ../data/KTH/vid ]; then
 	rm ${vidclass}.zip
   done
   # this file is corrupted
+  chmod +w ../data/KTH/vid/boxing/person01_boxing_d4_uncomp.avi
   rm ../data/KTH/vid/boxing/person01_boxing_d4_uncomp.avi
 fi