Peter M. Groen / openbr

Commit 9a1a17829fd6769569639f8c1de8c594f10c476b

Authored by Jordan Cheney
1 parent ec7e4126

Use ObjectType instead of Label when getting object types for evaluation. Label … 

…is used in other ways throughout the evaluation framework making the output incorrect at times
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
openbr/core/evalutils.cpp
  View file @9a1a178
@@ -51,14 +51,14 @@ QList<Detection> EvalUtils::getDetections(const DetectionKey &key, const File &f @@ -51,14 +51,14 @@ QList<Detection> EvalUtils::getDetections(const DetectionKey &key, const File &f
51 if (pose.contains("Angle")) 51 if (pose.contains("Angle"))
52 pose = "Frontal"; 52 pose = "Frontal";
53 53
54 - QString label = f.get<QString>("Label", ""); 54 + QString label = f.get<QString>("ObjectType", "").toLower();
55 55
56 const QString filePath = f.path() + "/" + f.fileName(); 56 const QString filePath = f.path() + "/" + f.fileName();
57 QList<Detection> dets; 57 QList<Detection> dets;
58 if (key.type == DetectionKey::RectList) { 58 if (key.type == DetectionKey::RectList) {
59 QList<QRectF> rects = f.rects(); 59 QList<QRectF> rects = f.rects();
60 QList<float> confidences = f.getList<float>("Confidences", QList<float>()); 60 QList<float> confidences = f.getList<float>("Confidences", QList<float>());
61 - QList<QString> labels = f.getList<QString>("Labels", QList<QString>()); 61 + QList<QString> labels = f.getList<QString>("ObjectTypes", QList<QString>());
62 if (!isTruth && rects.size() != confidences.size()) 62 if (!isTruth && rects.size() != confidences.size())
63 qFatal("You don't have enough confidence. I mean, your detections don't all have confidence measures."); 63 qFatal("You don't have enough confidence. I mean, your detections don't all have confidence measures.");
64 if (!labels.empty() && rects.size() != labels.size()) 64 if (!labels.empty() && rects.size() != labels.size())
@@ -263,7 +263,7 @@ QStringList EvalUtils::computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;d @@ -263,7 +263,7 @@ QStringList EvalUtils::computeDetectionResults(const QList&lt;ResolvedDetection&gt; &amp;d
263 float TP = 0, FP = 0, prevFP = -1, prevTP = -1; 263 float TP = 0, FP = 0, prevFP = -1, prevTP = -1;
264 264
265 QList<float> FARsToOutput; 265 QList<float> FARsToOutput;
266 - FARsToOutput << 1 << .5 << .2 << .1 << .02 << .01 << .001; 266 + FARsToOutput << 10 << 1 << .5 << .2 << .1 << .02 << .01 << .001;
267 267
268 QDebug debug = qDebug(); 268 QDebug debug = qDebug();
269 debug.noquote(); 269 debug.noquote();