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

Josh Klontz
2 parents bbf17e0d ad5a289a
Showing 6 changed files with 128 additions and 37 deletions
openbr/core/bee.cpp
openbr/core/core.cpp
openbr/core/qtutils.cpp
openbr/core/qtutils.h
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
@@ -239,9 +239,11 @@ void BEE::makeMask(const QString &amp;targetInput, const QString &amp;queryInput, const 
     FileList queries = (queryInput == ".") ? targets : TemplateList::fromGallery(queryInput).files();
     int partitions = targets.first().get<int>("crossValidate");
     if (partitions == 0) writeMask(makeMask(targets, queries), mask, targetInput, queryInput);
-    else for (int i=0; i<partitions; i++) {
-        QString maskPartition = mask;
-        writeMask(makeMask(targets, queries, i), maskPartition.insert(maskPartition.indexOf('.'),"Partition_" + QString::number(i)), targetInput, queryInput);
+    else {
+        if (!mask.contains("%1")) qFatal("Mask file name missing partition number place marker (%1)");
+        for (int i=0; i<partitions; i++) {
+            writeMask(makeMask(targets, queries, i), mask.arg(i), targetInput, queryInput);
+        }
     }
 }
  
@@ -202,10 +202,20 @@ struct AlgorithmCore
         retrieveOrEnroll(targetGallery, t, targetFiles);
         retrieveOrEnroll(queryGallery, q, queryFiles);
  
-        // Make multiple outputs if output[split]
+        QList<int> partitionSizes;
+        QList<File> outputFiles;
+        if (output.contains("split")) {
+            if (!output.fileName().contains("%1")) qFatal("Output file name missing split number place marker (%1)");
+            partitionSizes = output.getList<int>("split");
+            for (int i=0; i<partitionSizes.size(); i++) {
+                File splitOutputFile = output.fileName().arg(i);
+                outputFiles.append(splitOutputFile);
+            }
+        }
+        else outputFiles.append(output);
  
-        // Split each
-        QScopedPointer<Output> o(Output::make(output, targetFiles, queryFiles));
+        QList<Output*> outputs;
+        foreach (const File &outputFile, outputFiles) outputs.append(Output::make(outputFile, targetFiles, queryFiles));
  
         if (distance.isNull()) qFatal("Null distance.");
         Globals->currentStep = 0;
@@ -218,26 +228,35 @@ struct AlgorithmCore
             queryBlock++;
             TemplateList queries = q->readBlock(&queryDone);
  
-            // Split queries by matrix into list of template lists if output[split]
-            // foreach TemplateList in perMatrixQueries
+            QList<TemplateList> queryPartitions;
+            if (!partitionSizes.empty()) queryPartitions = queries.partition(partitionSizes);
+            else queryPartitions.append(queries);
  
-            int targetBlock = -1;
-            bool targetDone = false;
-            while (!targetDone) {
-                targetBlock++;
-                // Check if templates contain the same number of matrices
-                // Split targets by matrix into templateList if output[split] for matrices i
+            for (int i=0; i<queryPartitions.size(); i++) {
+                int targetBlock = -1;
+                bool targetDone = false;
+                while (!targetDone) {
+                    targetBlock++;
  
-                TemplateList targets = t->readBlock(&targetDone);
+                    TemplateList targets = t->readBlock(&targetDone);
  
-                o->setBlock(queryBlock, targetBlock);
-                distance->compare(targets, queries, o.data());
+                    QList<TemplateList> targetPartitions;
+                    if (!partitionSizes.empty()) targetPartitions = targets.partition(partitionSizes);
+                    else targetPartitions.append(targets);
  
-                Globals->currentStep += double(targets.size()) * double(queries.size());
-                Globals->printStatus();
+                    if (queryPartitions[i].first().size() != targetPartitions[i].first().size()) qFatal("Query and target templates have different number of matrices.");
+
+                    outputs[i]->setBlock(queryBlock, targetBlock);
+                    distance->compare(targetPartitions[i], queryPartitions[i], outputs[i]);
+
+                    Globals->currentStep += double(targets.size()) * double(queries.size());
+                    Globals->printStatus();
+                }
             }
         }
  
+        qDeleteAll(outputs);
+
         const float speed = 1000 * Globals->totalSteps / Globals->startTime.elapsed() / std::max(1, abs(Globals->parallelism));
         if (!Globals->quiet && (Globals->totalSteps > 1)) fprintf(stderr, "\rSPEED=%.1e  \n", speed);
         Globals->totalSteps = 0;
@@ -285,6 +285,28 @@ void QtUtils::checkArgsSize(const QString &amp;name, const QStringList &amp;args, int mi
     if (args.size() > max) qFatal("%s expects no more than %d arguments, got %d", qPrintable(name), max, args.size());
 }
  
+QPointF QtUtils::toPoint(const QString &string)
+{
+    QStringList values = string.split(',');
+    if (values.size() == 2) {
+        values[1].chop(1);
+        QPointF point(values[0].mid(1).toFloat(), values[1].toFloat());
+        return point;
+    }
+    else qFatal("Failed to convert %s to QPoint format.", qPrintable(string));
+}
+
+QRectF QtUtils::toRect(const QString &string)
+{
+    QStringList values = string.split(',');
+    if (values.size() == 4) {
+        values[3].chop(1);
+        QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].toFloat());
+        return rect;
+    }
+    else qFatal("Failed to convert %s to QRect format.", qPrintable(string));
+}
+
 bool QtUtils::runRScript(const QString &file)
 {
     QProcess RScript;
@@ -62,6 +62,8 @@ namespace QtUtils
     QString shortTextHash(QString string);
     QStringList parse(QString args, char split = ',');
     void checkArgsSize(const QString &name, const QStringList &args, int min, int max);
+    QPointF toPoint(const QString &string);
+    QRectF toRect(const QString &string);
  
     /**** Process Utilities ****/
     bool runRScript(const QString &file);
@@ -55,11 +55,11 @@ QString File::flat() const
         if (value.isNull()) values.append(key);
         else {
             if (QString(value.typeName()) == "QVariantList") {
-                QStringList landmarks;
-                foreach(const QVariant &landmark, qvariant_cast<QVariantList>(value)) {
-                    landmarks.append(QtUtils::toString(landmark));
+                QStringList variants;
+                foreach(const QVariant &variant, qvariant_cast<QVariantList>(value)) {
+                    variants.append(QtUtils::toString(variant));
                 }
-                if (!landmarks.isEmpty()) values.append(key + "=[" + landmarks.join(", ") + "]");
+                if (!variants.isEmpty()) values.append(key + "=[" + variants.join(", ") + "]");
             }
             else values.append(key + "=" + QtUtils::toString(value));
         }
@@ -147,26 +147,26 @@ void File::set(const QString &amp;key, const QVariant &amp;value)
     m_metadata.insert(key, value);
 }
  
+// Note that we assume all values within a parameter list are the same type
 void File::set(const QString &key, const QString &value)
 {
     if (value[0] == '[') /* QVariantList */ {
         QStringList values = value.mid(1, value.size()-2).split(", ");
-        foreach(const QString &word, values) set(key, word);
-    }
-    else if (value[0] == '(') {
-        QStringList values = value.split(',');
-        if (values.size() == 2) /* QPointF */ {
-            values[1].chop(1);
-            QPointF point(values[0].mid(1).toFloat(), values[1].toFloat());
-            if (key != "Points") m_metadata.insert(key, point);
-            else appendPoint(point);
+        QList<QVariant> variants;
+        if (values[0][0] == '(') /* List of Points or Rects */ {
+            if (values[0].split(',').size() == 2) /* List of Points */ foreach(const QString &word, values) variants.append(QtUtils::toPoint(word));
+            else if (values[0].split(',').size() == 4) /* List of Rects */ foreach(const QString &word, values) variants.append(QtUtils::toRect(word));
+            else qFatal("Incorrect landmark format.");
         }
-        else /* QRectF */ {
-            values[3].chop(1);
-            QRectF rect(values[0].mid(1).toFloat(), values[1].toFloat(), values[2].toFloat(), values[3].toFloat());
-            if (key != "Rects") m_metadata.insert(key, rect);
-            else appendRect(rect);
+        else {
+            foreach(const QString &word, values) variants.append(word.toFloat());
         }
+        m_metadata.insert(key, variants);
+    }
+    else if (value[0] == '(') /* Point or Rect */ {
+        if (value.split(',').size() == 2) /* QPointF */ m_metadata.insert(key, QtUtils::toPoint(value));
+        else if (value.split(',').size() == 4) /* QRectF */ m_metadata.insert(key, QtUtils::toRect(value));
+        else qFatal("Incorrect landmark format.");
     }
     else m_metadata.insert(key, value);
 }
@@ -207,6 +207,19 @@ struct BR_EXPORT File
         return variant.value<T>();
     }
  
+    /*!< \brief Returns a list of type T for the key, throwing an error if the key does not exist or if the value cannot be converted to the specified type. */
+    template <typename T>
+    QList<T> getList(const QString &key) const
+    {
+        if (!contains(key)) qFatal("Missing key: %s", qPrintable(key));
+        QList<T> list;
+        foreach (const QVariant &item, m_metadata[key].toList()) {
+            if (item.canConvert<T>()) list.append(item.value<T>());
+            else qFatal("Failed to convert value for key %s.", qPrintable(key));
+        }
+        return list;
+    }
+
     /*!< \brief Specialization for boolean type. */
     bool getBool(const QString &key) const;
  
@@ -375,6 +388,39 @@ struct TemplateList : public QList&lt;Template&gt;
     }
  
     /*!
+     * \brief Returns a #br::TemplateList containing templates with one matrix at the specified index \em index.
+     */
+    QList<TemplateList> partition(const QList<int> &partitionSizes) const
+    {
+        int sum = 0;
+        QList<TemplateList> partitions; partitions.reserve(partitionSizes.size());
+
+        for(int i=0; i<partitionSizes.size(); i++) {
+            partitions.append(TemplateList());
+            sum+=partitionSizes[i];
+        }
+
+        if (sum != first().size()) qFatal("Partition sizes do not span template matrices properly");
+
+        foreach (const Template &t, *this) {
+            int index = 0;
+            while (index < t.size()) {
+                for (int i=0; i<partitionSizes.size(); i++) {
+                    Template newTemplate;
+                    for (int j=0; j<partitionSizes[i]; j++) {
+                        newTemplate.append(t[index]);
+                        index++;
+                    }
+                    // Append to the ith element of partitions
+                    partitions[i].append(newTemplate);
+                }
+            }
+        }
+
+        return partitions;
+    }
+
+    /*!
      * \brief Returns #br::Template::file for each template in the list.
      */
     FileList files() const