Peter M. Groen / openbr

Commit 9d766e1ed84dcb6571117c640f34ce8577af8e44

Authored by Scott Klum
1 parent aea4edb6

Added some additional comments for rank and rr output

Inline Side-by-side
Showing 2 changed files with 2 additions and 0 deletions
openbr/plugins/output/rank.cpp
  View file @9d766e1
... ... @@ -44,6 +44,7 @@ class rankOutput : public MatrixOutput
44 44 typedef QPair<float,int> Pair;
45 45 int rank = 1;
46 46 foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true)) {
  47 + // Check if target files are marked as allParitions, and make sure target and query files are in the same partition
47 48 if (Globals->crossValidate > 0 ? (targetFiles[pair.second].get<int>("Partition",-1) == -1 || targetFiles[pair.second].get<int>("Partition",-1) == queryFiles[i].get<int>("Partition",-1)) : true) {
48 49 if (QString(targetFiles[pair.second]) != QString(queryFiles[i])) {
49 50 if (targetFiles[pair.second].get<QString>("Label") == queryFiles[i].get<QString>("Label")) {
... ...
openbr/plugins/output/rr.cpp
  View file @9d766e1
... ... @@ -48,6 +48,7 @@ class rrOutput : public MatrixOutput
48 48  
49 49 typedef QPair<float,int> Pair;
50 50 foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true, limit)) {
  51 + // Check if target files are marked as allParitions, and make sure target and query files are in the same partition
51 52 if (Globals->crossValidate > 0 ? (targetFiles[pair.second].get<int>("Partition",-1) == -1 || targetFiles[pair.second].get<int>("Partition",-1) == queryFiles[i].get<int>("Partition",-1)) : true) {
52 53 if (pair.first < threshold) break;
53 54 File target = targetFiles[pair.second];
... ...