serialization fixes

Josh Klontz
1 parent bbfa70e5
Showing 3 changed files with 37 additions and 4 deletions
openbr/plugins/algorithms.cpp
openbr/plugins/integral.cpp
openbr/plugins/quantize.cpp
@@ -42,7 +42,7 @@ class AlgorithmsInitializer : public Initializer
         Globals->abbreviations.insert("OpenBR", "FaceRecognition");
         Globals->abbreviations.insert("GenderEstimation", "GenderClassification");
         Globals->abbreviations.insert("AgeEstimation", "AgeRegression");
-        Globals->abbreviations.insert("FaceRecognitionHoG", "Open+Cvt(Gray)+Cascade(FrontalFace)+ASEFEyes+Affine(64,64,0.25,0.35)+Gradient+Bin(0,360,8,true)+Merge+Integral+IntegralSampler+ProductQuantization(2,L1,true):ProductQuantization(true)");
+        Globals->abbreviations.insert("FaceRecognitionHoG", "{PP5Register+Affine(128,128,0.25,0.35)+Cvt(Gray)}+Gradient+Bin(0,360,9,true)+Merge+Integral+RecursiveIntegralSampler(4,2,8,LDA(.95)+Normalize(L1)+Div(3)+ProductQuantization(3,L1,true)[fraction=0.2]):ProductQuantization(true)");
  
         // Generic Image Processing
         Globals->abbreviations.insert("SIFT", "Open+KeyPointDetector(SIFT)+KeyPointDescriptor(SIFT):KeyPointMatcher(BruteForce)");
@@ -248,7 +248,7 @@ class RecursiveIntegralSamplerTransform : public Transform
     void store(QDataStream &stream) const
     {
         transform->store(stream);
-        stream << (subTransform == NULL);
+        stream << (subTransform != NULL);
         if (subTransform != NULL)
             subTransform->store(stream);
     }
@@ -247,7 +247,7 @@ QVector&lt;Mat&gt; ProductQuantizationLUTs;
 /*!
  * \ingroup distances
  * \brief Distance in a product quantized space \cite jegou11
- * \author Josh Klontz
+ * \author Josh Klontz \cite jklontz
  */
 class ProductQuantizationDistance : public Distance
 {
@@ -278,6 +278,36 @@ class ProductQuantizationDistance : public Distance
 BR_REGISTER(Distance, ProductQuantizationDistance)
  
 /*!
+ * \ingroup distances
+ * \brief Recurively computed distance in a product quantized space
+ * \author Josh Klontz \cite jklontz
+ */
+class RecursiveProductQuantizationDistance : public Distance
+{
+    Q_OBJECT
+
+    float compare(const Template &a, const Template &b) const
+    {
+        float distance = 0;
+        for (int i=0; i<a.size(); i++) {
+            const int elements = a[i].total()-sizeof(quint16);
+            uchar *aData = a[i].data;
+            uchar *bData = b[i].data;
+            quint16 index = *reinterpret_cast<quint16*>(aData);
+            aData += sizeof(quint16);
+            bData += sizeof(quint16);
+
+            const float *lut = (const float*)ProductQuantizationLUTs[index].data;
+            for (int j=0; j<elements; j++)
+                 distance += lut[j*256*256 + aData[j]*256+bData[j]];
+        }
+        return distance;
+    }
+};
+
+BR_REGISTER(Distance, RecursiveProductQuantizationDistance)
+
+/*!
  * \ingroup transforms
  * \brief Product quantization \cite jegou11
  * \author Josh Klontz \cite jklontz
@@ -461,7 +491,10 @@ private:
  
     void load(QDataStream &stream)
     {
-        stream >> index >> centers >> ProductQuantizationLUTs[index];
+        stream >> index >> centers;
+        while (ProductQuantizationLUTs.size() <= index)
+            ProductQuantizationLUTs.append(Mat());
+        stream >> ProductQuantizationLUTs[index];
     }
 };