Added rankOuput

Scott Klum
1 parent bd3fbd91
Showing 4 changed files with 50 additions and 1 deletions
sdk/core/plot.cpp
sdk/plugins/output.cpp
sdk/plugins/stasm.cpp
share/openbr/cmake/FindStasm.cmake
@@ -254,6 +254,13 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
         lines.append(qPrintable(QString("CMC,%1,%2").arg(QString::number(i), QString::number(float(realizedReturns)/possibleReturns))));
     }
  
+    // Write good matches and bad matches
+    /*
+    const int Good_Matches = 3;
+    const int Bad_Matches = 3;
+
+    for (int i = 1; i<=)*/
+
     if (!csv.isEmpty()) QtUtils::writeFile(csv, lines);
     qDebug("TAR @ FAR = 0.01: %.3f", result);
     return result;
@@ -259,6 +259,46 @@ BR_REGISTER(Output, EmptyOutput)
  
 /*!
  * \ingroup outputs
+ * \brief Outputs highest ranked matches with scores.
+ * \author Scott Klum \cite sklum
+ */
+class rankOutput : public MatrixOutput
+{
+    Q_OBJECT
+
+    ~rankOutput()
+    {
+        if (targetFiles.isEmpty() || queryFiles.isEmpty()) return;
+
+        QList<int> ranks;
+        QList<double> scores;
+        QStringList lines;
+
+        for (int i=0; i<queryFiles.size(); i++) {
+            typedef QPair<float,int> Pair;
+            int rank = 1;
+            foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true)) {
+                if(targetFiles[pair.second].label() == queryFiles[i].label()) {
+                    ranks.append(rank);
+                    scores.append(pair.first);
+                    break;
+                }
+                rank++;
+            }
+        }
+
+        typedef QPair<int,int> RankPair;
+        foreach (const RankPair &pair, Common::Sort(ranks, false))
+            lines.append(queryFiles[pair.second].name + " " + QString::number(pair.first) + " " + QString::number(scores[pair.second]) + " " + targetFiles[pair.second].name);
+
+        QtUtils::writeFile(file, lines);
+    }
+};
+
+BR_REGISTER(Output, rankOutput)
+
+/*!
+ * \ingroup outputs
  * \brief The highest scoring matches.
  * \author Josh Klontz \cite jklontz
  */
@@ -45,7 +45,7 @@ class StasmTransform : public UntrainableTransform
  
         AsmSearchDll(&nlandmarks, landmarks,
                      qPrintable(src.file.name), reinterpret_cast<char*>(src.m().data), src.m().cols, src.m().rows,
-                     src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"));
+                     src.m(), (src.m().channels() == 3), qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-68-1d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/mu-76-2d.conf"),  qPrintable(Globals->sdkPath + "/share/openbr/models/stasm/"));
  
         if (nlandmarks == 0) qWarning("Unable to detect Stasm landmarks");
  
@@ -12,6 +12,8 @@ find_path(Stasm_DIR include/stasm.hpp ${CMAKE_SOURCE_DIR}/3rdparty/*)
  
 add_subdirectory(${Stasm_DIR} ${Stasm_DIR}/build)
  
+set(SRC ${SOURCE};${SRC})
+
 include_directories(${Stasm_DIR}/include)
 link_directories(${Stasm_DIR}/build)