Add support for a simple append flag for enroll

This change consolidates the previous 'read' and 'noDuplicates' flags into a single 'append' flag. If append is specified, and an output gallery already exists, and the gallery format supports read/write or has explicit append support, then enrollment will be restricted to those files in the input list not already present in the gallery, and the results will be appended to the existing gallery. append defaults to 'false', which is a deparature from previous behavior. The .gal format has explicit append support, for other cases, if the gallery supports both read and write (less common than you might think), we support append by reading the existing gallery, and writing back out to an overwriting file. It should be possible to add explicit append support to several other gallery types.

Add support for a simple append flag for enroll
This change consolidates the previous 'read' and 'noDuplicates' flags into a single 'append' flag. If append is specified, and an output gallery already exists, and the gallery format supports read/write or has explicit append support, then enrollment will be restricted to those files in the input list not already present in the gallery, and the results will be appended to the existing gallery. append defaults to 'false', which is a deparature from previous behavior. The .gal format has explicit append support, for other cases, if the gallery supports both read and write (less common than you might think), we support append by reading the existing gallery, and writing back out to an overwriting file. It should be possible to add explicit append support to several other gallery types.
Charles Otto
1 parent e0aabf8c
Showing 5 changed files with 72 additions and 7 deletions
openbr/core/core.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/gallery.cpp
openbr/plugins/misc.cpp
@@ -121,6 +121,8 @@ struct AlgorithmCore
  
     FileList enroll(File input, File gallery = File())
     {
+        FileList files;
+
         qDebug("Enrolling %s%s", qPrintable(input.flat()),
                gallery.isNull() ? "" : qPrintable(" to " + gallery.flat()));
  
@@ -128,12 +130,29 @@ struct AlgorithmCore
             if (input.name.isEmpty()) return FileList();
             else                      gallery = getMemoryGallery(input);
         }
+        TemplateList data(TemplateList::fromGallery(input));
+
+        if (gallery.contains("append"))
+        {
+            // Remove any templates which are already in the gallery
+            QScopedPointer<Gallery> g(Gallery::make(gallery));
+            files = g->files();
+            QStringList names = files.names();
+            for (int i = data.size() - 1; i>=0; i--) {
+                if (names.contains(data[i].file.name))
+                {
+                    data.removeAt(i);
+                }
+            }
+        }
+
+        if (data.empty())
+            return files;
  
-        TemplateList i(TemplateList::fromGallery(input));
  
         // Trust me, this makes complete sense.
         // We're just going to make a pipe with a placeholder first transform
-        QString pipeDesc = "Identity+ProgressCounter("+QString::number(i.length())+")+GalleryOutput("+gallery.flat()+")+Discard";
+        QString pipeDesc = "Identity+ProgressCounter("+QString::number(data.length())+")+GalleryOutput("+gallery.flat()+")+Discard";
         QScopedPointer<Transform> basePipe(Transform::make(pipeDesc,NULL));
  
         CompositeTransform * downcast = dynamic_cast<CompositeTransform *>(basePipe.data());
@@ -157,9 +176,10 @@ struct AlgorithmCore
         // and get the final stream's stages by reinterpreting the pipe. Perfectly straightforward.
         wrapper->init();
  
-        wrapper->projectUpdate(i,i);
+        wrapper->projectUpdate(data,data);
  
-        return i.files();
+        files.append(data.files());
+        return files;
     }
  
     void enroll(TemplateList &data)
@@ -1153,6 +1153,17 @@ Gallery *Gallery::make(const File &amp;file)
     return gallery;
 }
  
+// Default init -- if the file contains "append", read the existing
+// data and immediately write it
+void Gallery::init()
+{
+    if (file.exists() && file.contains("append"))
+    {
+        TemplateList data = this->read();
+        this->writeBlock(data);
+    }
+}
+
 /* Transform - public methods */
 Transform::Transform(bool _independent, bool _trainable)
 {
@@ -1060,6 +1060,7 @@ public:
     void writeBlock(const TemplateList &templates); /*!< \brief Serialize a template list. */
     virtual void write(const Template &t) = 0; /*!< \brief Serialize a template. */
     static Gallery *make(const File &file); /*!< \brief Make a gallery to/from a file on disk. */
+    void init();
  
 private:
     QSharedPointer<Gallery> next;
@@ -73,6 +73,11 @@ class arffGallery : public Gallery
         arffFile.write(qPrintable(OpenCVUtils::matrixToStringList(t).join(',')));
         arffFile.write(qPrintable(",'" + t.file.get<QString>("Label") + "'\n"));
     }
+
+    void init()
+    {
+        //
+    }
 };
  
 BR_REGISTER(Gallery, arffGallery)
@@ -94,7 +99,12 @@ class galGallery : public Gallery
         if (file.get<bool>("remove", false))
             gallery.remove();
         QtUtils::touchDir(gallery);
-        if (!gallery.open(QFile::ReadWrite | QFile::Append))
+        QFile::OpenMode mode = QFile::ReadWrite;
+
+        if (file.contains("append"))
+            mode |= QFile::Append;
+
+        if (!gallery.open(mode))
             qFatal("Can't open gallery: %s", qPrintable(gallery.fileName()));
         stream.setDevice(&gallery);
     }
@@ -579,6 +589,11 @@ class templateGallery : public Gallery
         (void) t;
         qFatal("No supported.");
     }
+
+    void init()
+    {
+        //
+    }
 };
  
 BR_REGISTER(Gallery, templateGallery)
@@ -737,6 +752,11 @@ class dbGallery : public Gallery
         (void) t;
         qFatal("Not supported.");
     }
+
+    void init()
+    {
+        //
+    }
 };
  
 BR_REGISTER(Gallery, dbGallery)
@@ -790,6 +810,11 @@ class googleGallery : public Gallery
         (void) t;
         qFatal("Not supported.");
     }
+
+    void init()
+    {
+        //
+    }
 };
  
 BR_REGISTER(Gallery, googleGallery)
@@ -883,6 +908,11 @@ class FDDBGallery : public Gallery
         (void) t;
         qFatal("Not implemented.");
     }
+
+    void init()
+    {
+        //
+    }
 };
  
 BR_REGISTER(Gallery, FDDBGallery)
@@ -927,6 +957,11 @@ class landmarksGallery : public Gallery
         (void) t;
         qFatal("Not implemented.");
     }
+
+    void init()
+    {
+        //
+    }
 };
  
 BR_REGISTER(Gallery, landmarksGallery)
@@ -520,8 +520,6 @@ class EventTransform : public UntrainableMetaTransform
 BR_REGISTER(Transform, EventTransform)
  
  
-//ProgressCounter+Output
-
 class GalleryOutputTransform : public TimeVaryingTransform
 {
     Q_OBJECT