Remove FileList return from br::Enroll

With this, we will not have to accumulate the file metadata during enroll which will help with memory use on large jobs. Functions actually using the return type (gui/classifier.cpp, and gallerytoolbar.cpp) updated to avoid using it directly. In gallerytoolbar.cpp, drop support for implicit enrollment to a .gal file.

Remove FileList return from br::Enroll
With this, we will not have to accumulate the file metadata during enroll which will help with memory use on large jobs. Functions actually using the return type (gui/classifier.cpp, and gallerytoolbar.cpp) updated to avoid using it directly. In gallerytoolbar.cpp, drop support for implicit enrollment to a .gal file.
Charles Otto
1 parent 74762655
Showing 4 changed files with 16 additions and 15 deletions
openbr/core/core.cpp
openbr/gui/classifier.cpp
openbr/gui/gallerytoolbar.cpp
openbr/openbr_plugin.h
@@ -161,15 +161,13 @@ struct AlgorithmCore
         return name + file.baseName() + file.hash() + ".mem";
     }
-    FileList enroll(File input, File gallery = File())
+    void enroll(File input, File gallery = File())
     {
-        FileList files;
-
         qDebug("Enrolling %s%s", qPrintable(input.flat()),
                gallery.isNull() ? "" : qPrintable(" to " + gallery.flat()));
         if (gallery.name.isEmpty()) {
-            if (input.name.isEmpty()) return FileList();
+            if (input.name.isEmpty()) return;
             else                      gallery = getMemoryGallery(input);
         }
@@ -212,12 +210,8 @@ struct AlgorithmCore
         progressCounter->setPropertyRecursive("totalProgress", QString::number(total));
         stream->projectUpdate(data, output);
-        files.append(output.files());
-
         if (multiProcess)
             delete enroll;
-
-        return files;
     }
     void project(File input, File output)
@@ -632,9 +626,9 @@ void br::Train(const File &amp;input, const File &amp;model)
     AlgorithmManager::getAlgorithm(model.get<QString>("algorithm"))->train(input, model);
 }
-FileList br::Enroll(const File &input, const File &gallery)
+void br::Enroll(const File &input, const File &gallery)
 {
-    return AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
+    AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
 }
 void br::Project(const File &input, const File &output)
@@ -37,7 +37,13 @@ void Classifier::setClassification(const QString &amp;key, const QString &amp;value)
 void Classifier::_classify(File file)
 {
     QString key, value;
-    foreach (const File &f, Enroll(file.flat(), File("[algorithm=" + algorithm + "]"))) {
+    QSharedPointer<Transform> transform = Transform::fromAlgorithm(algorithm);
+
+    TemplateList input, output;
+    input.append(file);
+    transform->projectUpdate(input, output);
+
+    foreach (const File &f, output.files() ) {
         if      (algorithm == "GenderClassification") key = "Gender";
         else if (algorithm == "AgeRegression")        key = "Age";
         else                                          key = algorithm;
@@ -83,9 +83,10 @@ void br::GalleryToolBar::_enroll(const br::File &amp;input)
 {
     galleryLock.lock();
     this->input = input;
-    if (input.suffix() == "gal") gallery = input.name + ".mem";
-    else                         gallery = QString("%1/galleries/%2.gal[cache]").arg(br::Globals->scratchPath(), qPrintable(input.baseName()+input.hash()));
-    files = br::Enroll(input.flat(), gallery.flat());
+    gallery = input.name + ".mem";
+    br::Enroll(input.flat(), gallery.flat());
+    files = FileList::fromGallery(gallery);
+
     galleryLock.unlock();
 }
@@ -1393,7 +1393,7 @@ BR_EXPORT void Train(const File &amp;input, const File &amp;model);
  * \brief High-level function for creating galleries.
  * \see br_enroll
  */
-BR_EXPORT FileList Enroll(const File &input, const File &gallery = File());
+BR_EXPORT void Enroll(const File &input, const File &gallery = File());
 /*!
  * \brief High-level function for enrolling templates.