Merge changes

Scott Klum
1 parent 4de57762
Showing 6 changed files with 60 additions and 12 deletions
openbr/core/core.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/output.cpp
openbr/plugins/pp5.cpp
openbr/plugins/validate.cpp
@@ -41,6 +41,7 @@ struct AlgorithmCore
  
     void train(const File &input, const QString &model)
     {
+        qDebug() << input;
         TemplateList data(TemplateList::fromGallery(input));
  
         if (transform.isNull()) qFatal("Null transform.");
@@ -393,6 +394,7 @@ void br::Convert(const File &amp;fileType, const File &amp;inputFile, const File &amp;output
         QSharedPointer<Output> o(Factory<Output>::make(outputFile));
         o->initialize(targetFiles, queryFiles);
  
+        qDebug() << m.rows << m.cols << targetFiles.size() << queryFiles.size();
         for (int i=0; i<queryFiles.size(); i++)
             for (int j=0; j<targetFiles.size(); j++)
                 o->setRelative(m.at<float>(i,j), i, j);
@@ -386,16 +386,27 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
             newTemplates = newTemplates.reduced();
  
         const int crossValidate = gallery.get<int>("crossValidate");
-        if (crossValidate > 0) srand(0);
  
-        if (gallery.getBool("leaveOneOut", 0)) {
-            QStringList subjects = File::get(newTemplates.files(),"Subject","-1");
-            subjects.
-            // Get QStringLists of unique subjects
-
-            // For each list of unique subjects, decide randomly which to test on
-            for (int i = 0; i < subjects.size(); i++) {
-                if (subjects
+        if (gallery.getBool("leaveOneOut")) {
+            QStringList subjects;
+            for (int i = 0; i < newTemplates.size(); i++) {
+                QString subject = newTemplates.at(i).file.get<QString>("Subject");
+                // Have we seen this subject before?
+                if (subjects.contains(subject)) {
+                    subjects.append(subject);
+                    // Get indices belonging to this subject
+                    QList<int> subjectIndices = newTemplates.find("Subject",subject);
+                    for (int j = 0; j < subjectIndices.size(); j++) {
+                        // Set subject partitions
+                        newTemplates[subjectIndices[j]].file.set("Partition",j);
+                    }
+                    // Generate more templates if necessary
+                    for (int j=0; j<crossValidate-subjectIndices.size(); j++) {
+                        Template leaveOneOutTemplate = newTemplates[subjectIndices[j%subjectIndices.size()]];
+                        leaveOneOutTemplate.file.set("Partition", j+subjectIndices.size());
+                        newTemplates.append(leaveOneOutTemplate);
+                    }
+                }
             }
         } else {
             for (int i=newTemplates.size()-1; i>=0; i--) {
@@ -509,6 +509,20 @@ struct TemplateList : public QList&lt;Template&gt;
             reduced.merge(t);
         return TemplateList() << reduced;
     }
+
+    /*!
+     * \brief Find the indices of templates with specified key, value pairs.
+     */
+    template<typename T>
+    QList<int> find(const QString& key, const T& value)
+    {
+        QList<int> indices;
+        for (int i=0; i<size(); i++)
+            if (at(i).file.contains(key))
+                if (at(i).file.get<T>(key) == value)
+                    indices.append(i);
+        return indices;
+    }
 };
  
 /*!
@@ -365,9 +365,12 @@ class evalOutput : public MatrixOutput
  
     ~evalOutput()
     {
+                              qDebug() << "here";
+
         if (data.data) {
             const QString csv = QString(file.name).replace(".eval", ".csv");
             if ((Globals->crossValidate == 0) || (!crossValidate)) {
+                              qDebug() << "here";
                 Evaluate(data, BEE::makeMask(targetFiles, queryFiles), csv);
             } else {
                 QFutureSynchronizer<float> futures;
@@ -299,6 +299,7 @@ BR_REGISTER(Transform, PP5EnrollTransform)
  * \brief Compare templates with PP5
  * \author Josh Klontz \cite jklontz
  * \author E. Taborsky \cite mmtaborsky
+ * \note PP5 distance is known to be asymmetric
  */
 class PP5CompareDistance : public Distance
                          , public PP5Context
 #include <QFutureSynchronizer>
 #include <QtConcurrentRun>
 #include "openbr_internal.h"
+#include "openbr/core/common.h"
 #include <openbr/core/qtutils.h>
  
 namespace br
@@ -17,7 +18,9 @@ class CrossValidateTransform : public MetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString description READ get_description WRITE set_description RESET reset_description STORED false)
+    Q_PROPERTY(bool leaveOneOut READ get_leaveOneOut WRITE set_leaveOneOut RESET reset_leaveOneOut STORED false)
     BR_PROPERTY(QString, description, "Identity")
+    BR_PROPERTY(bool, leaveOneOut, false)
  
     QList<br::Transform*> transforms;
  
@@ -41,11 +44,25 @@ class CrossValidateTransform : public MetaTransform
         QFutureSynchronizer<void> futures;
         for (int i=0; i<numPartitions; i++) {
             TemplateList partitionedData = data;
+            QList<int> removed;
             for (int j=partitionedData.size()-1; j>=0; j--)
-                // Remove all templates from partition i
-                if (partitions[j] == i)
-                    partitionedData.removeAt(j);
+                // Remove all templates belonging to partition i
+                // if leaveOneOut is true,
+                // and i is greater than the number of images for a particular subject
+                // even if the partitions are different
+                if (leaveOneOut) {
+                        QList<int> subjectIndices = partitionedData.find("Subject",partitionedData.at(j).file.get<QString>("Subject"));
+                        qDebug() << i << subjectIndices.size();
+                        if (i > subjectIndices.size()) {
+                            qDebug() << i%subjectIndices.size();
+                            removed.append(subjectIndices[i%subjectIndices.size()]);
+                        }
+                } else if (partitions[j] == i)
+                    removed.append(j);
+            typedef QPair<int,int> Pair;
+            foreach (const Pair &pair, Common::Sort(removed,true)) partitionedData.removeAt(pair.first);
             // Train on the remaining templates
+            foreach (const Template &t, partitionedData) qDebug() << "Remaining data for partition " << i << ": " << t.file.baseName();
             futures.addFuture(QtConcurrent::run(transforms[i], &Transform::train, partitionedData));
         }
         futures.waitForFinished();