From 6e96c4e040676d007cfc3fbea5f2cf3160054107 Mon Sep 17 00:00:00 2001
From: Scott Klum <scott.klum@gmail.com>
Date: Thu, 18 Apr 2013 20:49:41 -0400
Subject: [PATCH] CrossValidation with same training across all splits

---
 openbr/core/core.cpp        |  3 +--
 openbr/core/plot.cpp        |  4 +++-
 openbr/openbr_plugin.cpp    |  4 ++--
 openbr/openbr_plugin.h      |  2 +-
 openbr/plugins/eigen3.cpp   |  1 +
 openbr/plugins/format.cpp   | 15 ++++++++++++++-
 openbr/plugins/stasm.cpp    |  6 ++++--
 openbr/plugins/validate.cpp |  9 +++++++--
 8 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp
index 1312dd1..09e5370 100644
--- a/openbr/core/core.cpp
+++ b/openbr/core/core.cpp
@@ -248,9 +248,8 @@ struct AlgorithmCore
                     if (!partitionSizes.empty()) targetPartitions = targets.partition(partitionSizes);
                     else targetPartitions.append(targets);
 
-                    if (queryPartitions[i].first().size() != targetPartitions[i].first().size()) qFatal("Query and target templates have different number of matrices.");
-
                     outputs[i]->setBlock(queryBlock, targetBlock);
+
                     distance->compare(targetPartitions[i], queryPartitions[i], outputs[i]);
 
                     Globals->currentStep += double(targets.size()) * double(queries.size());
diff --git a/openbr/core/plot.cpp b/openbr/core/plot.cpp
index fe05c95..51e5439 100644
--- a/openbr/core/plot.cpp
+++ b/openbr/core/plot.cpp
@@ -268,7 +268,7 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv)
     }
 
     // Write Cumulative Match Characteristic (CMC) curve
-    const int Max_Retrieval = 100;
+    const int Max_Retrieval = 200;
     const int Report_Retrieval = 5;
 
     float reportRetrievalRate = -1;
@@ -472,6 +472,8 @@ struct RPlot
     }
 };
 
+// Does not work if dataset folder starts with a number
+
 bool Plot(const QStringList &files, const br::File &destination, bool show)
 {
     qDebug("Plotting %d file(s) to %s", files.size(), qPrintable(destination));
diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp
index 49d62e3..7e83f9b 100644
--- a/openbr/openbr_plugin.cpp
+++ b/openbr/openbr_plugin.cpp
@@ -137,7 +137,7 @@ QVariant File::value(const QString &key) const
 
 QVariant File::parse(const QString &value)
 {
-    bool ok;
+    bool ok = false;
     const QPointF point = QtUtils::toPoint(value, &ok);
     if (ok) return point;
     const QRectF rect = QtUtils::toRect(value, &ok);
@@ -1003,7 +1003,7 @@ void Output::reformat(const FileList &targetFiles, const FileList &queryFiles, c
     const int columns = targetFiles.size();
     for (int i=0; i<rows; i++)
         for (int j=0; j<columns; j++)
-            o->setRelative(m.at<float>(i,i), i, j);
+            o->setRelative(m.at<float>(i,j), i, j);
 }
 
 /* Output - protected methods */
diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h
index e5290b4..f6a2419 100644
--- a/openbr/openbr_plugin.h
+++ b/openbr/openbr_plugin.h
@@ -410,7 +410,7 @@ struct TemplateList : public QList<Template>
             sum+=partitionSizes[i];
         }
 
-        if (sum != first().size()) qFatal("Partition sizes do not span template matrices properly");
+        if (sum != first().size()) qFatal("Partition sizes %i do not span template matrices %i properly", sum, first().size());
 
         foreach (const Template &t, *this) {
             int index = 0;
diff --git a/openbr/plugins/eigen3.cpp b/openbr/plugins/eigen3.cpp
index 8ee362e..750e6fa 100644
--- a/openbr/plugins/eigen3.cpp
+++ b/openbr/plugins/eigen3.cpp
@@ -330,6 +330,7 @@ class LDATransform : public Transform
     void train(const TemplateList &_trainingSet)
     {
         TemplateList trainingSet = TemplateList::relabel(_trainingSet);
+
         int instances = trainingSet.size();
 
         // Perform PCA dimensionality reduction
diff --git a/openbr/plugins/format.cpp b/openbr/plugins/format.cpp
index e1221d6..2b3b04e 100644
--- a/openbr/plugins/format.cpp
+++ b/openbr/plugins/format.cpp
@@ -317,6 +317,7 @@ BR_REGISTER(Format, maskFormat)
  * \brief MATLAB <tt>.mat</tt> format.
  * \author Josh Klontz \cite jklontz
  * http://www.mathworks.com/help/pdf_doc/matlab/matfile_format.pdf
+ * \note matFormat is known not to work with compressed matrices
  */
 class matFormat : public Format
 {
@@ -324,12 +325,18 @@ class matFormat : public Format
 
     struct Element
     {
+        // It is always best to cast integers to a Qt integer type, such as qint16 or quint32, when reading and writing.
+        // This ensures that you always know exactly what size integers you are reading and writing, no matter what the
+        // underlying platform and architecture the application happens to be running on.
+        // http://qt-project.org/doc/qt-4.8/datastreamformat.html
         quint32 type, bytes;
         QByteArray data;
         Element() : type(0), bytes(0) {}
         Element(QDataStream &stream)
             : type(0), bytes(0)
         {
+            // Read first 4 bytes into type (32 bit integer),
+            // specifying the type of data used
             if (stream.readRawData((char*)&type, 4) != 4)
                 qFatal("Unexpected end of file.");
 
@@ -340,11 +347,16 @@ class matFormat : public Format
                 bytes = bytes >> 16;
             } else {
                 // Regular format
+                // Read 4 bytes into bytes (32 bit integer),
+                // specifying the size of the element
                 if (stream.readRawData((char*)&bytes, 4) != 4)
                     qFatal("Unexpected end of file.");
             }
 
+            // Set the size of data to bytes
             data.resize(bytes);
+
+            // Read bytes amount of data from the file into data
             if (int(bytes) != stream.readRawData(data.data(), bytes))
                 qFatal("Unexpected end of file.");
 
@@ -372,8 +384,9 @@ class matFormat : public Format
         while (!f.atEnd()) {
             Element element(f);
 
-            // miCOMPRESS
+            // miCOMPRESSED
             if (element.type == 15) {
+                // Prepend the number of bytes to element.data
                 element.data.prepend((char*)&element.bytes, 4); // Qt zlib wrapper requires this to preallocate the buffer
                 QDataStream uncompressed(qUncompress(element.data));
                 element = Element(uncompressed);
diff --git a/openbr/plugins/stasm.cpp b/openbr/plugins/stasm.cpp
index f6bdc03..d905296 100644
--- a/openbr/plugins/stasm.cpp
+++ b/openbr/plugins/stasm.cpp
@@ -34,7 +34,7 @@ BR_REGISTER(Initializer, StasmInitializer)
  * \author Scott Klum \cite sklum
  */
 // TODO: Use a global mutex to prevent concurrent calls to AsmSearchDll
-#if 0
+
 class StasmTransform : public UntrainableTransform
 {
     Q_OBJECT
@@ -46,6 +46,9 @@ class StasmTransform : public UntrainableTransform
 
     void project(const Template &src, Template &dst) const
     {
+        static QMutex mutex;
+        QMutexLocker locker(&mutex);
+
         int nlandmarks;
         int landmarks[500];
 
@@ -68,7 +71,6 @@ class StasmTransform : public UntrainableTransform
 };
 
 BR_REGISTER(Transform, StasmTransform)
-#endif
 
 } // namespace br
 
diff --git a/openbr/plugins/validate.cpp b/openbr/plugins/validate.cpp
index c74cf1b..09dbdd3 100644
--- a/openbr/plugins/validate.cpp
+++ b/openbr/plugins/validate.cpp
@@ -52,8 +52,13 @@ class CrossValidateTransform : public MetaTransform
     }
 
     void project(const Template &src, Template &dst) const
-    {
-        transforms[src.file.get<int>("Partition", 0)]->project(src, dst);
+    {        
+        // If the src partition is greater than the number of training partitions,
+        // assume that projection should be done using the same training data for all partitions.
+        int partition = src.file.get<int>("Partition", 0);
+        if (partition >= transforms.size()-1) partition = 0;
+
+        transforms[partition]->project(src, dst);
     }
 
     void store(QDataStream &stream) const
--
libgit2 0.21.4