From 9d766e1ed84dcb6571117c640f34ce8577af8e44 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Thu, 21 May 2015 10:49:55 -0400 Subject: [PATCH] Added some additional comments for rank and rr output --- openbr/plugins/output/rank.cpp | 1 + openbr/plugins/output/rr.cpp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/openbr/plugins/output/rank.cpp b/openbr/plugins/output/rank.cpp index 3faa64b..45993a9 100644 --- a/openbr/plugins/output/rank.cpp +++ b/openbr/plugins/output/rank.cpp @@ -44,6 +44,7 @@ class rankOutput : public MatrixOutput typedef QPair Pair; int rank = 1; foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true)) { + // Check if target files are marked as allParitions, and make sure target and query files are in the same partition if (Globals->crossValidate > 0 ? (targetFiles[pair.second].get("Partition",-1) == -1 || targetFiles[pair.second].get("Partition",-1) == queryFiles[i].get("Partition",-1)) : true) { if (QString(targetFiles[pair.second]) != QString(queryFiles[i])) { if (targetFiles[pair.second].get("Label") == queryFiles[i].get("Label")) { diff --git a/openbr/plugins/output/rr.cpp b/openbr/plugins/output/rr.cpp index 509e14e..7e0bed3 100644 --- a/openbr/plugins/output/rr.cpp +++ b/openbr/plugins/output/rr.cpp @@ -48,6 +48,7 @@ class rrOutput : public MatrixOutput typedef QPair Pair; foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true, limit)) { + // Check if target files are marked as allParitions, and make sure target and query files are in the same partition if (Globals->crossValidate > 0 ? (targetFiles[pair.second].get("Partition",-1) == -1 || targetFiles[pair.second].get("Partition",-1) == queryFiles[i].get("Partition",-1)) : true) { if (pair.first < threshold) break; File target = targetFiles[pair.second]; -- libgit2 0.21.4