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

Brendan Klare
2 parents 228938c5 6a9e4eb0
Showing 4 changed files with 42 additions and 20 deletions
openbr/openbr_plugin.cpp
openbr/plugins/algorithms.cpp
openbr/plugins/gallery.cpp
openbr/plugins/stream.cpp
@@ -137,6 +137,8 @@ QVariant File::parse(const QString &amp;value)
     if (ok) return point;
     const QRectF rect = QtUtils::toRect(value, &ok);
     if (ok) return rect;
+    const int i = value.toInt(&ok);
+    if (ok) return i;
     const float f = value.toFloat(&ok);
     if (ok) return f;
     return value;
@@ -44,7 +44,7 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("AgeEstimation", "AgeRegression");
         Globals->abbreviations.insert("FaceRecognition2", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+(Gradient+Bin(0,360,9,true))/(Blur(1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2,true)+Bin(0,10,10,true))+Merge+Integral+RecursiveIntegralSampler(4,2,8,LDA(.98)+Normalize(L1))+Cat+PCA(768)+Normalize(L1)+Quantize:UCharL1");
         Globals->abbreviations.insert("CropFace", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.25,0.35)");
-        Globals->abbreviations.insert("4SF", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.33,0.45)+(Grid(10,10)+SIFTDescriptor(12)+ByRow)/(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))+PCA(0.95)+Normalize(L2)+Dup(12)+RndSubspace(0.05,1)+LDA(0.98)+Cat+PCA(0.95)+Normalize(L1)+Quantize:NegativeLogPlusOne(ByteL1)");
+        Globals->abbreviations.insert("4SF", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(128,128,0.33,0.45)+(Grid(10,10)+SIFTDescriptor(12)+ByRow)/(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))+PCA(0.95)+Cat+Normalize(L2)+Dup(12)+RndSubspace(0.05,1)+LDA(0.98)+Cat+PCA(0.95)+Normalize(L1)+Quantize:NegativeLogPlusOne(ByteL1)");
  
         // Video
         Globals->abbreviations.insert("DisplayVideo", "Stream(FPSLimit(30)+Show(false,[FrameNumber])+Discard)");
@@ -506,38 +506,55 @@ BR_REGISTER(Gallery, csvGallery)
  * \brief Treats each line as a file.
  * \author Josh Klontz \cite jklontz
  *
- * The entire line is treated as the file path.
+ * The entire line is treated as the file path. An optional label may be specified using a space ' ' separator:
  *
+\verbatim
+<FILE>
+<FILE>
+...
+<FILE>
+\endverbatim
+ * or
+\verbatim
+<FILE> <LABEL>
+<FILE> <LABEL>
+...
+<FILE> <LABEL>
+\endverbatim
  * \see csvGallery
  */
 class txtGallery : public Gallery
 {
     Q_OBJECT
-    Q_PROPERTY(QString metadataKey READ get_metadataKey WRITE set_metadataKey RESET reset_metadataKey STORED false)
-    BR_PROPERTY(QString, metadataKey, "")
+    Q_PROPERTY(QString label READ get_label WRITE set_label RESET reset_label STORED false)
+    BR_PROPERTY(QString, label, "")
  
     QStringList lines;
  
     ~txtGallery()
     {
-        if (!lines.isEmpty()) QtUtils::writeFile(file.name, lines);
+        if (!lines.isEmpty())
+            QtUtils::writeFile(file.name, lines);
     }
  
     TemplateList readBlock(bool *done)
     {
-        *done = true;
         TemplateList templates;
-        if (!file.exists()) return templates;
-
-        foreach (const QString &line, QtUtils::readLines(file))
-            templates.append(File(line));
+        foreach (const QString &line, QtUtils::readLines(file)) {
+            int splitIndex = line.lastIndexOf(' ');
+            if (splitIndex == -1) templates.append(File(line));
+            else                  templates.append(File(line.mid(0, splitIndex), line.mid(splitIndex+1)));
+        }
         *done = true;
         return templates;
     }
  
     void write(const Template &t)
     {
-        lines.append(metadataKey.isEmpty() ? t.file.flat() : t.file.get<QString>(metadataKey));
+        QString line = t.file.name;
+        if (!label.isEmpty())
+            line += " " + t.file.get<QString>(label);
+        lines.append(line);
     }
 };
  
@@ -687,7 +704,9 @@ class dbGallery : public Gallery
         if (!subset.isEmpty()) {
             const QStringList &words = subset.split(":");
             QtUtils::checkArgsSize("Input", words, 2, 4);
-            seed = QtUtils::toInt(words[0]);
+            if      (words[0] == "train") seed = 0;
+            else if (words[0] == "test" ) seed = 1;
+            else                          seed = QtUtils::toInt(words[0]);
             if (words[1].startsWith('{') && words[1].endsWith('}')) {
                 foreach (const QString &regexp, words[1].mid(1, words[1].size()-2).split(","))
                     metadataFields.append(QRegExp(regexp));
@@ -813,16 +832,10 @@ class googleGallery : public Gallery
         return templates;
     }
  
-    void write(const Template &t)
+    void write(const Template &)
     {
-        (void) t;
         qFatal("Not supported.");
     }
-
-    void init()
-    {
-        //
-    }
 };
  
 BR_REGISTER(Gallery, googleGallery)
@@ -1285,11 +1285,18 @@ public:
             qWarning("Attempted to train untrainable transform, nothing will happen.");
             return;
         }
+        QList<TemplateList> separated;
+        foreach (const TemplateList & list, data) {
+            foreach(const Template & t, list) {
+                separated.append(TemplateList());
+                separated.last().append(t);
+            }
+        }
  
         for (int i=0; i < transforms.size(); i++) {
             // OK we have a trainable transform, we need to get input data for it.
             if (transforms[i]->trainable) {
-                QList<TemplateList> copy = data;
+                QList<TemplateList> copy = separated;
                 // Project from the start to the trainable stage.
                 subProject(copy,i);