Changes to training subsampling

Remove variables related to subsampling training data from Transform, move them to a new transform called DownsampleTraining, and perform subsampling in that transform, rather than as part of IndependentTransform (which depended on the subsampling variables in Transform). The prior approach was incompatible with using explicit class variable names, rather than assuming a fixed label variable. This is because the actual downsampling was carried out as part of IndependentTransform, which is not a visible part of the algorithm grammar. Removing this logic from Independent/Transform is generally desirable if only to avoid cluttering Transform with member variables that are only used some of the time, and used in a (fairly) restrictive way. The current approach of makring DownsampleTraining as an indepent transform is still limited since the downsample logic (still) cannot be applied without the split used in Independent, and also DownsampleTraining can only be implemented as a wrapper for another transform (because the argument to train is const, and performing the donwsample logic in project would also impact the testing case (since we have no way to exclude a transform used in training from use in testing, for a fixed algorithm)).

Changes to training subsampling
Remove variables related to subsampling training data from Transform, move them to a new transform called DownsampleTraining, and perform subsampling in that transform, rather than as part of IndependentTransform (which depended on the subsampling variables in Transform). The prior approach was incompatible with using explicit class variable names, rather than assuming a fixed label variable. This is because the actual downsampling was carried out as part of IndependentTransform, which is not a visible part of the algorithm grammar. Removing this logic from Independent/Transform is generally desirable if only to avoid cluttering Transform with member variables that are only used some of the time, and used in a (fairly) restrictive way. The current approach of makring DownsampleTraining as an indepent transform is still limited since the downsample logic (still) cannot be applied without the split used in Independent, and also DownsampleTraining can only be implemented as a wrapper for another transform (because the argument to train is const, and performing the donwsample logic in project would also impact the testing case (since we have no way to exclude a transform used in training from use in testing, for a fixed algorithm)).
Charles Otto
1 parent 63f5d257
Showing 5 changed files with 53 additions and 43 deletions
openbr/openbr_plugin.cpp
openbr/openbr_plugin.h
openbr/plugins/algorithms.cpp
openbr/plugins/independent.cpp
openbr/plugins/openbr_internal.h
@@ -1083,9 +1083,6 @@ Transform::Transform(bool _independent, bool _trainable)
 {
     independent = _independent;
     trainable = _trainable;
-    classes = std::numeric_limits<int>::max();
-    instances = std::numeric_limits<int>::max();
-    fraction = 1;
 }
  
 Transform *Transform::make(QString str, QObject *parent)
@@ -1141,9 +1138,6 @@ Transform *Transform::make(QString str, QObject *parent)
 Transform *Transform::clone() const
 {
     Transform *clone = Factory<Transform>::make(file.flat());
-    clone->classes = classes;
-    clone->instances = instances;
-    clone->fraction = fraction;
     return clone;
 }
  
@@ -1068,12 +1068,6 @@ class BR_EXPORT Transform : public Object
     Q_OBJECT
  
 public:
-    Q_PROPERTY(int classes READ get_classes WRITE set_classes RESET reset_classes STORED false)
-    Q_PROPERTY(int instances READ get_instances WRITE set_instances RESET reset_instances STORED false)
-    Q_PROPERTY(float fraction READ get_fraction WRITE set_fraction RESET reset_fraction STORED false)
-    BR_PROPERTY(int, classes, std::numeric_limits<int>::max())
-    BR_PROPERTY(int, instances, std::numeric_limits<int>::max())
-    BR_PROPERTY(float, fraction, 1)
     bool independent, trainable;
  
     virtual ~Transform() {}
@@ -48,7 +48,7 @@ class AlgorithmsInitializer : public Initializer
         // Video
         Globals->abbreviations.insert("DisplayVideo", "Stream([Show(false)+Discard])");
         Globals->abbreviations.insert("PerFrameDetection", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+RestoreMat(original)+Draw(inPlace=true),Show(false)+Discard])");
-        Globals->abbreviations.insert("AgeGenderDemo", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+Expand+<FaceClassificationRegistration>+<FaceClassificationExtraction>+(<AgeRegressor>+Rename(Subject,Age)+Discard)/(<GenderClassifier>+Rename(Subject,Gender)+Discard)+RestoreMat(original)+Draw(inPlace=true)+DrawPropertiesPoint([Age,Gender],Affine_0,inPlace=true)+SaveMat(original)+Discard+Contract,RestoreMat(original)+FPSCalc+Show(false,[AvgFPS,Age,Gender])+Discard])");
+        Globals->abbreviations.insert("AgeGenderDemo", "Stream([SaveMat(original)+Cvt(Gray)+Cascade(FrontalFace)+Expand+<FaceClassificationRegistration>+<FaceClassificationExtraction>+<AgeRegressor>/<GenderClassifier>+Discard+RestoreMat(original)+Draw(inPlace=true)+DrawPropertiesPoint([Age,Gender],Affine_0,inPlace=true)+SaveMat(original)+Discard+Contract,RestoreMat(original)+FPSCalc+Show(false,[AvgFPS,Age,Gender])+Discard])");
  
         // Generic Image Processing
         Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
@@ -74,14 +74,14 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("FaceDetection", "(Open+Cvt(Gray)+Cascade(FrontalFace))");
         Globals->abbreviations.insert("DenseLBP", "(Blur(1.1)+Gamma(0.2)+DoG(1,2)+ContrastEq(0.1,10)+LBP(1,2)+RectRegions(8,8,6,6)+Hist(59))");
         Globals->abbreviations.insert("DenseSIFT", "(Grid(10,10)+SIFTDescriptor(12)+ByRow)");
-        Globals->abbreviations.insert("FaceRecognitionRegistration", "(ASEFEyes+Affine(88,88,0.25,0.35)+FTE(DFFS,instances=1))");
-        Globals->abbreviations.insert("FaceRecognitionExtraction", "(Mask+DenseSIFT/DenseLBP+PCA(0.95,instances=1)+Normalize(L2)+Cat)");
-        Globals->abbreviations.insert("FaceRecognitionEmbedding", "(Dup(12)+RndSubspace(0.05,1)+LDA(0.98,instances=-2)+Cat+PCA(768,instances=1))");
+        Globals->abbreviations.insert("FaceRecognitionRegistration", "(ASEFEyes+Affine(88,88,0.25,0.35)+DownsampleTraining(FTE(DFFS),instances=1))");
+        Globals->abbreviations.insert("FaceRecognitionExtraction", "(Mask+DenseSIFT/DenseLBP+DownsampleTraining(PCA(0.95),instances=1)+Normalize(L2)+Cat)");
+        Globals->abbreviations.insert("FaceRecognitionEmbedding", "(Dup(12)+RndSubspace(0.05,1)+DownsampleTraining(LDA(0.98),instances=-2)+Cat+DownsampleTraining(PCA(768),instances=1))");
         Globals->abbreviations.insert("FaceRecognitionQuantization", "(Normalize(L1)+Quantize)");
         Globals->abbreviations.insert("FaceClassificationRegistration", "(ASEFEyes+Affine(56,72,0.33,0.45)+FTE(DFFS))");
-        Globals->abbreviations.insert("FaceClassificationExtraction", "((Grid(7,7)+SIFTDescriptor(8)+ByRow)/DenseLBP+PCA(0.95,instances=-1)+Cat)");
-        Globals->abbreviations.insert("AgeRegressor", "Center(Range,instances=-1)+SVM(RBF,EPS_SVR,inputVariable=Age,instances=100)");
-        Globals->abbreviations.insert("GenderClassifier", "Center(Range,instances=-1)+SVM(RBF,C_SVC,inputVariable=Gender,instances=4000)");
+        Globals->abbreviations.insert("FaceClassificationExtraction", "((Grid(7,7)+SIFTDescriptor(8)+ByRow)/DenseLBP+DownsampleTraining(PCA(0.95),instances=-1, inputVariable=Gender)+Cat)");
+        Globals->abbreviations.insert("AgeRegressor", "DownsampleTraining(Center(Range),instances=-1)+DownsampleTraining(SVM(RBF,EPS_SVR,inputVariable=Age),instances=100, inputVariable=Age)");
+        Globals->abbreviations.insert("GenderClassifier", "DownsampleTraining(Center(Range),instances=-1, inputVariable=Gender)+DownsampleTraining(SVM(RBF,C_SVC,inputVariable=Gender),instances=4000, inputVariable=Gender)");
         Globals->abbreviations.insert("UCharL1", "Unit(ByteL1)");
     }
 };
@@ -9,16 +9,16 @@ using namespace cv;
 namespace br
 {
  
-static TemplateList Downsample(const TemplateList &templates, const Transform *transform, const QString & inputVariable)
+static TemplateList Downsample(const TemplateList &templates, int classes, int instances, float fraction, const QString & inputVariable)
 {
     // Return early when no downsampling is required
-    if ((transform->classes == std::numeric_limits<int>::max()) &&
-            (transform->instances == std::numeric_limits<int>::max()) &&
-            (transform->fraction >= 1))
+    if ((classes == std::numeric_limits<int>::max()) &&
+            (instances == std::numeric_limits<int>::max()) &&
+            (fraction >= 1))
         return templates;
  
-    const bool atLeast = transform->instances < 0;
-    const int instances = abs(transform->instances);
+    const bool atLeast = instances < 0;
+    instances = abs(instances);
  
     QList<QString> allLabels = templates.get<QString>(inputVariable);
     QList<QString> uniqueLabels = allLabels.toSet().toList();
@@ -26,20 +26,20 @@ static TemplateList Downsample(const TemplateList &amp;templates, const Transform *t
  
     QMap<QString,int> counts = templates.countValues<QString>(inputVariable, instances != std::numeric_limits<int>::max());
  
-    if ((instances != std::numeric_limits<int>::max()) && (transform->classes != std::numeric_limits<int>::max()))
+    if ((instances != std::numeric_limits<int>::max()) && (classes != std::numeric_limits<int>::max()))
         foreach (const QString & label, counts.keys())
             if (counts[label] < instances)
                 counts.remove(label);
  
     uniqueLabels = counts.keys();
-    if ((transform->classes != std::numeric_limits<int>::max()) && (uniqueLabels.size() < transform->classes))
-        qWarning("Downsample requested %d classes but only %d are available.", transform->classes, uniqueLabels.size());
+    if ((classes != std::numeric_limits<int>::max()) && (uniqueLabels.size() < classes))
+        qWarning("Downsample requested %d classes but only %d are available.", classes, uniqueLabels.size());
  
     Common::seedRNG();
     QList<QString> selectedLabels = uniqueLabels;
-    if (transform->classes < uniqueLabels.size()) {
+    if (classes < uniqueLabels.size()) {
         std::random_shuffle(selectedLabels.begin(), selectedLabels.end());
-        selectedLabels = selectedLabels.mid(0, transform->classes);
+        selectedLabels = selectedLabels.mid(0, classes);
     }
  
     TemplateList downsample;
@@ -56,14 +56,45 @@ static TemplateList Downsample(const TemplateList &amp;templates, const Transform *t
             downsample.append(templates.value(indices[j]));
     }
  
-    if (transform->fraction < 1) {
+    if (fraction < 1) {
         std::random_shuffle(downsample.begin(), downsample.end());
-        downsample = downsample.mid(0, downsample.size()*transform->fraction);
+        downsample = downsample.mid(0, downsample.size()*fraction);
     }
  
     return downsample;
 }
  
+class DownsampleTrainingTransform : public Transform
+{
+    Q_OBJECT
+    Q_PROPERTY(br::Transform* transform READ get_transform WRITE set_transform RESET reset_transform STORED true)
+    Q_PROPERTY(int classes READ get_classes WRITE set_classes RESET reset_classes STORED false)
+    Q_PROPERTY(int instances READ get_instances WRITE set_instances RESET reset_instances STORED false)
+    Q_PROPERTY(float fraction READ get_fraction WRITE set_fraction RESET reset_fraction STORED false)
+    Q_PROPERTY(QString inputVariable READ get_inputVariable WRITE set_inputVariable RESET reset_inputVariable STORED false)
+    BR_PROPERTY(br::Transform*, transform, NULL)
+    BR_PROPERTY(int, classes, std::numeric_limits<int>::max())
+    BR_PROPERTY(int, instances, std::numeric_limits<int>::max())
+    BR_PROPERTY(float, fraction, 1)
+    BR_PROPERTY(QString, inputVariable, "Label")
+
+    void project(const Template & src, Template & dst) const
+    {
+       transform->project(src,dst);      
+    }
+  
+	  
+    void train(const TemplateList &data)
+    {
+        if (!transform || !transform->trainable)
+            return;
+
+        TemplateList downsampled = Downsample(data, classes, instances, fraction, inputVariable);
+        transform->train(downsampled);
+    }
+};
+BR_REGISTER(Transform, DownsampleTrainingTransform)
+
 /*!
  * \ingroup transforms
  * \brief Clones the transform so that it can be applied independently.
@@ -74,9 +105,7 @@ class IndependentTransform : public MetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(br::Transform* transform READ get_transform WRITE set_transform RESET reset_transform STORED false)
-    Q_PROPERTY(QString inputVariable READ get_inputVariable WRITE set_inputVariable RESET reset_inputVariable STORED false)
     BR_PROPERTY(br::Transform*, transform, NULL)
-    BR_PROPERTY(QString, inputVariable, "Label")
  
     QList<Transform*> transforms;
  
@@ -124,13 +153,10 @@ class IndependentTransform : public MetaTransform
         while (transforms.size() < templatesList.size())
             transforms.append(transform->clone());
  
-        for (int i=0; i<templatesList.size(); i++)
-            templatesList[i] = Downsample(templatesList[i], transforms[i], inputVariable);
-
         QFutureSynchronizer<void> futures;
         for (int i=0; i<templatesList.size(); i++)
-            futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
-        futures.waitForFinished();
+	  futures.addFuture(QtConcurrent::run(_train, transforms[i], &templatesList[i]));
+	futures.waitForFinished();
     }
  
     void project(const Template &src, Template &dst) const
@@ -225,10 +225,6 @@ public:
         }
  
         output->file = this->file;
-        output->classes = classes;
-        output->instances = instances;
-        output->fraction = fraction;
-
         output->init();
  
         return output;