merging

Scott Klum
1 parent 5c7fd6bf
Showing 2 changed files with 6 additions and 5 deletions
sdk/core/plot.cpp
sdk/plugins/output.cpp
@@ -120,7 +120,7 @@ float Evaluate(const QString &amp;simmat, const QString &amp;mask, const QString &amp;csv)
     const Mat scores = BEE::readSimmat(simmat);
     File maskFile(mask); maskFile.insert("Size", scores.rows);
     const Mat masks = BEE::readMask(maskFile);
-    if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch.");
+    if (scores.size() != masks.size()) qFatal("Simmat %i /Mask %i size mismatch.", scores.size(), mask.size());
  
     // Make comparisons
     QList<Comparison> comparisons; comparisons.reserve(scores.rows*scores.cols);
@@ -278,7 +278,7 @@ class rankOutput : public MatrixOutput
             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()) {
+                if(targetFiles[pair.second].getString("Label") == queryFiles[i].getString("Label")) {
                     ranks.append(rank);
                     scores.append(pair.first);
                     break;
@@ -288,9 +288,10 @@ class rankOutput : public MatrixOutput
         }
  
         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);
-
+        foreach (const RankPair &pair, Common::Sort(ranks, false)) {
+            qDebug() << ranks[pair.second];
+            lines.append(queryFiles[pair.second].name + " " + QString::number(pair.first) + " " + QString::number(scores[pair.second]) + " " + targetFiles[ranks[pair.second]].name);
+}
         QtUtils::writeFile(file, lines);
     }
 };