Refactor FTE template exclusion

introduce a separate function to split FTE templates to a different list Better handling of FTE exclusion during training (no reason to every include fte templates in calls to train). Remove File::failed, instead use direct access to fte.

Refactor FTE template exclusion
introduce a separate function to split FTE templates to a different list Better handling of FTE exclusion during training (no reason to every include fte templates in calls to train). Remove File::failed, instead use direct access to fte.
Charles Otto
1 parent 6e844a9c
Showing 5 changed files with 51 additions and 55 deletions
openbr/frvt2012.cpp
openbr/openbr_plugin.h
openbr/plugins/meta.cpp
openbr/plugins/openbr_internal.h
openbr/plugins/stream.cpp
@@ -133,7 +133,7 @@ int32_t SdkEstimator::estimate_age(const ONEFACE &amp;input_face, int32_t &amp;age)
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_age_transform.data();
     age = templates.first().file.get<float>("Age");
-    return templates.first().file.failed() ? 4 : 0;
+    return templates.first().file.fte ? 4 : 0;
 }
 int32_t SdkEstimator::estimate_gender(const ONEFACE &input_face, int8_t &gender, double &mf)
@@ -142,5 +142,5 @@ int32_t SdkEstimator::estimate_gender(const ONEFACE &amp;input_face, int8_t &amp;gender,
     templates.append(templateFromONEFACE(input_face));
     templates >> *frvt2012_gender_transform.data();
     mf = gender = templates.first().file.get<QString>("Gender") == "Male" ? 0 : 1;
-    return templates.first().file.failed() ? 4 : 0;
+    return templates.first().file.fte ? 4 : 0;
 }
@@ -308,8 +308,6 @@ struct BR_EXPORT File
         return result;
     }
-    inline bool failed() const { return fte; } /*!< \brief Returns \c true if the file failed to open or enroll, \c false otherwise. */
-
     QList<QPointF> namedPoints() const; /*!< \brief Returns points convertible from metadata keys. */
     QList<QPointF> points() const; /*!< \brief Returns the file's points list. */
     void appendPoint(const QPointF &point); /*!< \brief Adds a point to the file's point list. */
@@ -545,7 +543,7 @@ struct TemplateList : public QList&lt;Template&gt;
     {
         QMap<T, int> labelCounts;
         foreach (const File &file, files())
-            if (!excludeFailures || !file.failed())
+            if (!excludeFailures || !file.fte)
                 labelCounts[file.get<T>(propName)]++;
         return labelCounts;
     }
@@ -76,21 +76,14 @@ class PipeTransform : public CompositeTransform
     void _projectPartial(TemplateList *srcdst, int startIndex, int stopIndex)
     {
-        TemplateList dst = *srcdst;
-        TemplateList temp;
+        TemplateList ftes;
         for (int i=startIndex; i<stopIndex; i++) {
-            TemplateList temp;
-            transforms[i]->project(dst, temp);
-
-            dst.clear();
-            foreach (const Template &t, *srcdst) {
-                if (!t.file.fte)
-                    dst.append(t);
-                else
-                    srcdst->append(t);
-            }
+            TemplateList res;
+            transforms[i]->project(*srcdst, res);
+
+            splitFTEs(res, ftes);
+            *srcdst = res;
         }
-        srcdst->append(dst);
     }
     void train(const QList<TemplateList> &data)
@@ -112,8 +105,12 @@ class PipeTransform : public CompositeTransform
             // if the transform is time varying, we can't project it in parallel
             if (transforms[i]->timeVarying()) {
                 fprintf(stderr, "\n%s projecting...", qPrintable(transforms[i]->objectName()));
-                for (int j=0; j < dataLines.size();j++)
+                for (int j=0; j < dataLines.size();j++) {
+                    TemplateList junk;
+                    splitFTEs(dataLines[j], junk);
+
                     transforms[i]->projectUpdate(dataLines[j], dataLines[j]);
+                }
                 // advance i since we already projected for this stage.
                 i++;
@@ -215,20 +212,15 @@ protected:
     // or if parallelism is disabled, handle them sequentially
    void _project(const TemplateList &src, TemplateList &dst) const
     {
-        TemplateList temp, output;
-        temp = src;
+        TemplateList ftes;
+        dst = src;
         foreach (const Transform *f, transforms) {
-            dst.clear();
-            f->project(temp, dst);
-            temp.clear();
-            foreach(const Template &t, dst) {
-                if (!t.file.fte)
-                    temp.append(t);
-                else output.append(t);
-            }
+            TemplateList res;
+            f->project(dst, res);
+            splitFTEs(res, ftes);
+            dst = res;
         }
-        output.append(temp);
-        dst = output;
+        dst.append(ftes);
     }
    // Single template const project, pass the template through each sub-transform, one after the other
@@ -481,6 +481,19 @@ Transform *wrapTransform(Transform *base, const QString &amp;target);
 Transform *pipeTransforms(QList<Transform *> &transforms);
+inline void splitFTEs(TemplateList &src, TemplateList  &ftes)
+{
+    TemplateList active = src;
+    src.clear();
+
+    foreach (const Template &t, active) {
+        if (t.file.fte && !Globals->enrollAll)
+            ftes.append(t);
+        else
+            src.append(t);
+    }
+}
+
 }
 #endif // OPENBR_INTERNAL_H
@@ -907,17 +907,12 @@ public:
             qFatal("null input to multi-thread stage");
         }
-        TemplateList project;
-        TemplateList completed;
-        for (int i=0; i < input->data.size(); i++) {
-            if (input->data[i].file.fte)
-                completed.append(input->data[i]);
-            else
-                project.append(input->data[i]);
-        }
-        input->data.clear();
-        transform->project(project, input->data);
-        input->data.append(completed);
+        TemplateList ftes;
+        splitFTEs(input->data, ftes);
+        TemplateList res;
+        transform->project(input->data, res);
+        input->data = res;
+        input->data.append(ftes);
         should_continue = nextStage->tryAcquireNextStage(input, final);
@@ -994,18 +989,12 @@ public:
         next_target = input->sequenceNumber + 1;
-        TemplateList project;
-        TemplateList completed;
-        foreach (const Template &t, input->data) {
-            if (t.file.fte)
-                completed.append(t);
-            else
-                project.append(t);
-        }
-        input->data.clear();
-        // Project the input we got
-        transform->projectUpdate(project, input->data);
-        input->data.append(completed);
+        TemplateList ftes;
+        splitFTEs(input->data, ftes);
+        TemplateList res;
+        transform->projectUpdate(input->data, res);
+        input->data = res;
+        input->data.append(ftes);
         should_continue = nextStage->tryAcquireNextStage(input,final);
@@ -1305,7 +1294,11 @@ public:
         QList<TemplateList> output;
         for (int i=0; i < data.size(); i++) {
-            projectUpdate(data[i], data[i]);
+            TemplateList res;
+            TemplateList ftes;
+            projectUpdate(data[i], res);
+            data[i] = res;
+            splitFTEs(data[i], ftes);
             output.append(collector.sets);
             collector.sets.clear();
         }