deprecated Transform::backProject

Josh Klontz
1 parent 2da536fa
Showing 6 changed files with 6 additions and 76 deletions
CHANGELOG.md
openbr/core/core.cpp
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/eigen3.cpp
openbr/plugins/meta.cpp
 0.4.0 - ??/??/??
 ================
 * Added -evalDetection and -plotDetection for evaluating and plotting object detection accuracy (#9)
+* Deprecated Transform::backProject
  
 0.3.0 - 5/22/13
 ===============
@@ -146,13 +146,7 @@ struct AlgorithmCore
                                 data.removeAt(i);
                     const int numFiles = data.size();
  
-                    if (Globals->backProject) {
-                        TemplateList backProjectedData;
-                        transform->backProject(data, backProjectedData);
-                        data = backProjectedData;
-                    } else {
-                        data >> *transform;
-                    }
+                    data >> *transform;
  
                     g->writeBlock(data);
                     const FileList newFiles = data.files();
@@ -1171,28 +1171,6 @@ void Transform::project(const TemplateList &amp;src, TemplateList &amp;dst) const
     futures.waitForFinished();
 }
  
-static void _backProject(const Transform *transform, const Template *dst, Template *src)
-{
-    try {
-        transform->backProject(*dst, *src);
-    } catch (...) {
-        qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->objectName()));
-        *src = Template(dst->file);
-        src->file.set("FTE", true);
-    }
-}
-
-void Transform::backProject(const TemplateList &dst, TemplateList &src) const
-{
-    src.reserve(dst.size());
-    for (int i=0; i<dst.size(); i++) src.append(Template());
-
-    QFutureSynchronizer<void> futures;
-    for (int i=0; i<dst.size(); i++)
-        futures.addFuture(QtConcurrent::run(_backProject, this, &dst[i], &src[i]));
-    futures.waitForFinished();
-}
-
 QList<Transform *> Transform::getChildren() const
 {
     QList<Transform *> output;
@@ -602,13 +602,6 @@ public:
     BR_PROPERTY(int, blockSize, parallelism * ((sizeof(void*) == 4) ? 128 : 1024))
  
     /*!
-     * \brief true if backProject should be used instead of project (the algorithm should be inverted)
-     */
-    Q_PROPERTY(bool backProject READ get_backProject WRITE set_backProject RESET reset_backProject)
-    BR_PROPERTY(bool, backProject, false)
-
-
-    /*!
      * \brief If \c true no messages will be sent to the terminal, \c false by default.
      */
     Q_PROPERTY(bool quiet READ get_quiet WRITE set_quiet RESET reset_quiet)
@@ -1034,6 +1027,10 @@ private:
  *  @{
  */
  
+/*!
+ * \brief For asynchronous events during template projection.
+ * \see #Transform::getEvent
+ */
 class TemplateEvent : public QObject
 {
     Q_OBJECT
@@ -1048,7 +1045,6 @@ signals:
     void theSignal(const Template & output) const;
 };
  
-
 /*!
  * \brief Plugin base class for processing a template.
  *
@@ -1078,8 +1074,6 @@ public:
     virtual void train(const TemplateList &data) = 0; /*!< \brief Train the transform. */
     virtual void project(const Template &src, Template &dst) const = 0; /*!< \brief Apply the transform. */
     virtual void project(const TemplateList &src, TemplateList &dst) const; /*!< \brief Apply the transform. */
-    virtual void backProject(const Template &dst, Template &src) const { src = dst; } /*!< \brief Invert the transform. */
-    virtual void backProject(const TemplateList &dst, TemplateList &src) const; /*!< \brief Invert the transform. */
  
     /*!< \brief Apply the transform, may update the transform's internal state */
     virtual void projectUpdate(const Template &src, Template &dst)
@@ -59,21 +59,6 @@ public:
     PCATransform() : keep(0.95), drop(0), whiten(false) {}
  
 private:
-    /*
-    void backProject(const Template &src, Template &dst) const
-    {
-        const cv::Mat &m = src;
-        dst = cv::Mat(originalRows, m.rows*m.cols/originalRows, CV_32FC1);
-
-        // Map Eigen into OpenCV
-        Eigen::Map<const Eigen::MatrixXf> inMap(m.ptr<float>(), keep, 1);
-        Eigen::Map<Eigen::MatrixXf> outMap(dst.m().ptr<float>(), m.rows*m.cols, 1);
-
-        // Do projection
-        outMap = (eVecs * inMap) + mean;
-    }
-    */
-
     double residualReconstructionError(const Template &src) const
     {
         Template proj;
@@ -129,26 +129,6 @@ class PipeTransform : public CompositeTransform
         }
     }
  
-    void backProject(const Template &dst, Template &src) const
-    {
-        // Backprojecting a time-varying transform is probably not going to work.
-        if (timeVarying()) qFatal("No backProject defined for time-varying transform");
-
-        src = dst;
-        // Reverse order in which transforms are processed
-        int length = transforms.length();
-        for (int i=length-1; i>=0; i--) {
-            Transform *f = transforms.at(i);
-            try {
-                src >> *f;
-            } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->objectName()));
-                src = Template(src.file);
-                src.file.set("FTE", true);
-            }
-        }
-    }
-
     void projectUpdate(const Template &src, Template &dst)
     {
         dst = src;
@@ -306,8 +286,6 @@ class ForkTransform : public CompositeTransform
         futures.waitForFinished();
     }
  
-    void backProject(const Template &dst, Template &src) const {Transform::backProject(dst, src);}
-
     // same as _project, but calls projectUpdate on sub-transforms
     void projectupdate(const Template & src, Template & dst)
     {