Fixed up some old debugs, added some comments

Scott Klum
1 parent 4bf65682
Showing 7 changed files with 9 additions and 15 deletions
openbr/core/core.cpp
openbr/openbr_plugin.cpp
openbr/plugins/cascade.cpp
openbr/plugins/eyes.cpp
openbr/plugins/landmarks.cpp
openbr/plugins/output.cpp
openbr/plugins/validate.cpp
@@ -41,7 +41,6 @@ struct AlgorithmCore
     void train(const File &input, const QString &model)
     {
-        qDebug() << input;
         TemplateList data(TemplateList::fromGallery(input));
         if (transform.isNull()) qFatal("Null transform.");
@@ -390,12 +390,12 @@ TemplateList TemplateList::fromGallery(const br::File &amp;gallery)
         if (gallery.getBool("leaveOneOut")) {
             QStringList subjects;
             for (int i = 0; i < newTemplates.size(); i++) {
-                QString subject = newTemplates.at(i).file.get<QString>("Subject");
+                QString subject = newTemplates.at(i).file.get<QString>("Label");
                 // 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);
+                    QList<int> subjectIndices = newTemplates.find("Label",subject);
                     for (int j = 0; j < subjectIndices.size(); j++) {
                         // Set subject partitions
                         newTemplates[subjectIndices[j]].file.set("Partition",j);
@@ -84,7 +84,6 @@ class CascadeTransform : public UntrainableMetaTransform
         foreach (const Template &t, src) {
             const bool enrollAll = t.file.getBool("enrollAll");
-            qDebug() << enrollAll;
             for (int i=0; i<t.size(); i++) {
                 const Mat &m = t[i];
                 vector<Rect> rects;
@@ -182,8 +182,8 @@ private:
         float second_eye_y = (right_rect.y + maxLoc.y)*gray.rows/height+roi.y;
         dst.m() = src.m();
-        //dst.file.appendPoint(QPointF(first_eye_x, first_eye_y));
-        //dst.file.appendPoint(QPointF(second_eye_x, second_eye_y));
+        dst.file.appendPoint(QPointF(first_eye_x, first_eye_y));
+        dst.file.appendPoint(QPointF(second_eye_x, second_eye_y));
         dst.file.set("First_Eye", QPointF(first_eye_x, first_eye_y));
         dst.file.set("Second_Eye", QPointF(second_eye_x, second_eye_y));
     }
@@ -313,7 +313,8 @@ class LoadLandmarksTransform : public UntrainableTransform
     {
         dst = src;
-        QString path = Globals->path + "/" + src.file.baseName() + ".dat";
+        // Assume the fiduciary file has the same basename as src
+        QString path = filePath + "/" + src.file.baseName() + ".dat";
         QFile f(path);
         if (!f.open(QIODevice::ReadOnly)) qFatal("Unable to open %s for reading.", qPrintable(path));
@@ -329,6 +330,8 @@ class LoadLandmarksTransform : public UntrainableTransform
             }
         }
+        if (landmarks.size() < 35) qFatal("Unrecognized landmark set format.");
+
         dst.file.set("rightEye", landmarks[16]);
         dst.file.set("leftEye", landmarks[18]);
@@ -365,12 +365,9 @@ 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;
@@ -52,11 +52,7 @@ class CrossValidateTransform : public MetaTransform
                 // 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()]);
-                        }
+                        if (i > subjectIndices.size()) removed.append(subjectIndices[i%subjectIndices.size()]);
                 } else if (partitions[j] == i)
                     removed.append(j);
             typedef QPair<int,int> Pair;