Premerge commit

Scott Klum
1 parent e67fca6c
Showing 6 changed files with 17 additions and 13 deletions
openbr/core/bee.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/distance.cpp
openbr/plugins/misc.cpp
openbr/plugins/stasm.cpp
@@ -265,6 +265,9 @@ cv::Mat BEE::makeMask(const br::FileList &amp;targets, const br::FileList &amp;queries, 
     QList<int> targetPartitions = targets.crossValidationPartitions();
     QList<int> queryPartitions = queries.crossValidationPartitions();
+    for (int i = 0; i < 5; i++) qDebug() << "QueryPartition " << queries[i].fileName() << ": " << queryPartitions[i];
+    for (int i = 0; i < 5; i++) qDebug() << "TargetPartition " << targets[i].fileName() << ": " << targetPartitions[i];
+
     Mat mask(queries.size(), targets.size(), CV_8UC1);
     for (int i=0; i<queries.size(); i++) {
         const QString &fileA = queries[i];
@@ -401,6 +401,7 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
 {
     TemplateList templates;
     foreach (const br::File &file, gallery.split()) {
+        qDebug() << file.name;
         QScopedPointer<Gallery> i(Gallery::make(file));
         TemplateList newTemplates = i->read();
@@ -424,7 +425,6 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
         const int crossValidate = gallery.get<int>("crossValidate");
         if (crossValidate > 0) srand(0);
-        // Propogate metadata
         for (int i=newTemplates.size()-1; i>=0; i--) {
             newTemplates[i].file.append(gallery.localMetadata());
             newTemplates[i].file.append(file.localMetadata());
@@ -299,7 +299,7 @@ struct BR_EXPORT FileList : public QList&lt;File&gt;
  * \brief A list of matrices associated with a file.
  *
  * The br::Template is one of the workhorse classes in OpenBR.
- * A template represents a biometric at various stages of enrollment and can be modified br::Transform and compared to other templates with br::Distance.
+ * A template represents a biometric at various stages of enrollment and can be modified by br::Transform and compared to other templates with br::Distance.
  *
  * While there exist many cases (ex. video enrollment, multiple face detects, per-patch subspace learning, ...) where the template will contain more than one matrix,
  * in most cases templates have exactly one matrix in their list representing a single image at various stages of enrollment.
@@ -197,7 +197,10 @@ class AverageDistance : public Distance
         if (a.size() != b.size()) qFatal("Comparison size mismatch");
         float score = 0;
-        for (int i = 0; i < a.size(); i++) score += distance->compare(a[i],b[i]);
+        for (int i = 0; i < a.size(); i++) {
+            qDebug() << "Computing score for: " << a.file.name << " vs. " << b.file.name;
+            score += distance->compare(a[i],b[i]);
+        }
         return score/(float)a.size();
     }
@@ -307,7 +307,7 @@ BR_REGISTER(Transform, LabelTransform)
 /*!
  * \ingroup transforms
- * \brief Name a point
+ * \brief Remove a name from a point
  * \author Scott Klum \cite sklum
  */
 class AnonymizeTransform : public UntrainableMetaTransform
@@ -33,15 +33,13 @@ BR_REGISTER(Initializer, StasmInitializer)
  * \brief Wraps STASM key point detector
  * \author Scott Klum \cite sklum
  */
-// TODO: Use a global mutex to prevent concurrent calls to AsmSearchDll
-
 class StasmTransform : public UntrainableTransform
 {
     Q_OBJECT
     void init()
     {
-        Globals->setProperty("parallelism", "0"); // Can only work in single threaded mode
+        // Load models
     }
     void project(const Template &src, Template &dst) const
@@ -49,22 +47,22 @@ class StasmTransform : public UntrainableTransform
         static QMutex mutex;
         QMutexLocker locker(&mutex);
-        int nlandmarks;
+        int numLandmarks;
         int landmarks[500];
-        AsmSearchDll(&nlandmarks, landmarks,
-                     qPrintable(src.file.name), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
-                     src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/"));
+        AsmSearchDll(numLandmarks, landmarks, qPrintable(src.file.name), reinterpret_cast<char*>(src.m().data), src.m(), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/"));
-        if (nlandmarks == 0) {
+        if (numLandmarks == 0) {
             qWarning("Unable to detect Stasm landmarks for %s", qPrintable(src.file.fileName()));
             dst.file.set("FTE", true);
             dst.m() = src.m();
             return;
         }
-        for (int i = 0; i < nlandmarks; i++)
+        for (int i = 0; i < numLandmarks; i++) {
+            qDebug() << QPointF(landmarks[2 * i], landmarks[2 * i + 1]);
             dst.file.appendPoint(QPointF(landmarks[2 * i], landmarks[2 * i + 1]));
+        }
         dst.m() = src.m();
     }