Peter M. Groen / openbr

Commit 22690ec76a1c18890686a5313f06b48e927265d4

Authored by bhklein
2 parents fac7a232 54f27eae

Merge branch 'eval_landmark_improvements' of https://github.com/biometrics/openb… 

…r into eval_landmark_improvements
Inline Side-by-side
Showing 7 changed files with 203 additions and 32 deletions
app/br/br.cpp
  View file @22690ec
... ... @@ -163,8 +163,8 @@ public:
163 163 check((parc >= 2) && (parc <= 6), "Incorrect parameter count for 'evalDetection'.");
164 164 br_eval_detection(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 0, parc == 6 ? atoi(parv[5]) : 0);
165 165 } else if (!strcmp(fun, "evalLandmarking")) {
166   - check((parc >= 2) && (parc <= 5), "Incorrect parameter count for 'evalLandmarking'.");
167   - br_eval_landmarking(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 1);
  166 + check((parc >= 2) && (parc <= 7), "Incorrect parameter count for 'evalLandmarking'.");
  167 + br_eval_landmarking(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? atoi(parv[3]) : 0, parc >= 5 ? atoi(parv[4]) : 1, parc >= 6 ? atoi(parv[5]) : 0, parc >= 7 ? atoi(parv[6]) : 5);
168 168 } else if (!strcmp(fun, "evalRegression")) {
169 169 check(parc >= 2 && parc <= 4, "Incorrect parameter count for 'evalRegression'.");
170 170 br_eval_regression(parv[0], parv[1], parc >= 3 ? parv[2] : "", parc >= 4 ? parv[3] : "");
... ... @@ -264,7 +264,7 @@ private:
264 264 "-evalClassification <predicted_gallery> <truth_gallery> <predicted property name> <ground truth proprty name>\n"
265 265 "-evalClustering <clusters> <gallery>\n"
266 266 "-evalDetection <predicted_gallery> <truth_gallery> [{csv}] [{normalize}] [{minSize}]\n"
267   - "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv} [<normalization_index_a> <normalization_index_b>]]\n"
  267 + "-evalLandmarking <predicted_gallery> <truth_gallery> [{csv} [<normalization_index_a> <normalization_index_b>] [sample_index] [total_examples]]\n"
268 268 "-evalRegression <predicted_gallery> <truth_gallery> <predicted property name> <ground truth property name>\n"
269 269 "-assertEval <simmat> <mask> <accuracy>\n"
270 270 "-plotDetection <file> ... <file> {destination}\n"
... ...
openbr/core/eval.cpp
  View file @22690ec
... ... @@ -18,6 +18,7 @@
18 18 #include "eval.h"
19 19 #include "openbr/core/common.h"
20 20 #include "openbr/core/qtutils.h"
  21 +#include "openbr/core/opencvutils.h"
21 22 #include <QMapIterator>
22 23  
23 24 using namespace cv;
... ... @@ -1037,16 +1038,25 @@ float EvalDetection(const QString &amp;predictedGallery, const QString &amp;truthGallery
1037 1038 return averageOverlap;
1038 1039 }
1039 1040  
1040   -float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv, int normalizationIndexA, int normalizationIndexB)
  1041 +static void projectAndWrite(Transform *t, const Template &src, const QString &filePath)
  1042 +{
  1043 + Template dst;
  1044 + t->project(src,dst);
  1045 + OpenCVUtils::saveImage(dst.m(),filePath);
  1046 +}
  1047 +
  1048 +float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv, int normalizationIndexA, int normalizationIndexB, int sampleIndex, int totalExamples)
1041 1049 {
1042 1050 qDebug("Evaluating landmarking of %s against %s", qPrintable(predictedGallery), qPrintable(truthGallery));
1043   - const TemplateList predicted(TemplateList::fromGallery(predictedGallery));
1044   - const TemplateList truth(TemplateList::fromGallery(truthGallery));
1045   - const QStringList predictedNames = File::get<QString>(predicted, "name");
1046   - const QStringList truthNames = File::get<QString>(truth, "name");
  1051 + TemplateList predicted(TemplateList::fromGallery(predictedGallery));
  1052 + TemplateList truth(TemplateList::fromGallery(truthGallery));
  1053 + QStringList predictedNames = File::get<QString>(predicted, "name");
  1054 + QStringList truthNames = File::get<QString>(truth, "name");
1047 1055  
1048 1056 int skipped = 0;
1049 1057 QList< QList<float> > pointErrors;
  1058 + QList<float> imageErrors;
  1059 + QList<float> normalizedLengths;
1050 1060 for (int i=0; i<predicted.size(); i++) {
1051 1061 const QString &predictedName = predictedNames[i];
1052 1062 const int truthIndex = truthNames.indexOf(predictedName);
... ... @@ -1054,39 +1064,94 @@ float EvalLandmarking(const QString &amp;predictedGallery, const QString &amp;truthGalle
1054 1064 const QList<QPointF> predictedPoints = predicted[i].file.points();
1055 1065 const QList<QPointF> truthPoints = truth[truthIndex].file.points();
1056 1066 if (predictedPoints.size() != truthPoints.size()) {
1057   - skipped++;
  1067 + predicted.removeAt(i);
  1068 + predictedNames.removeAt(i);
  1069 + truth.removeAt(i);
  1070 + truthNames.removeAt(i);
  1071 + i--; skipped++;
1058 1072 continue;
1059 1073 }
  1074 +
1060 1075 while (pointErrors.size() < predictedPoints.size())
1061 1076 pointErrors.append(QList<float>());
  1077 +
  1078 + // Want to know error for every image.
  1079 +
1062 1080 if (normalizationIndexA >= truthPoints.size()) qFatal("Normalization index A is out of range.");
1063 1081 if (normalizationIndexB >= truthPoints.size()) qFatal("Normalization index B is out of range.");
1064 1082 const float normalizedLength = QtUtils::euclideanLength(truthPoints[normalizationIndexB] - truthPoints[normalizationIndexA]);
1065   - for (int j=0; j<predictedPoints.size(); j++)
1066   - pointErrors[j].append(QtUtils::euclideanLength(predictedPoints[j] - truthPoints[j])/normalizedLength);
  1083 + normalizedLengths.append(normalizedLength);
  1084 + float totalError = 0;
  1085 + for (int j=0; j<predictedPoints.size(); j++) {
  1086 + float error = QtUtils::euclideanLength(predictedPoints[j] - truthPoints[j])/normalizedLength;
  1087 + totalError += error;
  1088 + pointErrors[j].append(error);
  1089 + }
  1090 + imageErrors.append(totalError/predictedPoints.size());
1067 1091 }
1068   - qDebug() << "Skipped " << skipped << " files due to point size mismatch.";
  1092 +
  1093 + qDebug() << "Skipped" << skipped << "files due to point size mismatch.";
1069 1094  
1070 1095 QList<float> averagePointErrors; averagePointErrors.reserve(pointErrors.size());
1071   - for (int i=0; i<pointErrors.size(); i++) {
1072   - std::sort(pointErrors[i].begin(), pointErrors[i].end());
1073   - averagePointErrors.append(Common::Mean(pointErrors[i]));
1074   - }
1075   - const float averagePointError = Common::Mean(averagePointErrors);
1076 1096  
1077 1097 QStringList lines;
1078 1098 lines.append("Plot,X,Y");
  1099 +
  1100 + QtUtils::touchDir(QDir("landmarking_examples_truth"));
  1101 + QtUtils::touchDir(QDir("landmarking_examples_predicted"));
  1102 +
  1103 + // Example
  1104 + {
  1105 + QScopedPointer<Transform> t(Transform::make("Open+Draw(verbose,rects=false,location=false)",NULL));
  1106 +
  1107 + QString filePath = "landmarking_examples_truth/"+truth[sampleIndex].file.fileName();
  1108 + projectAndWrite(t.data(), truth[sampleIndex],filePath);
  1109 + lines.append("Sample,"+filePath+","+QString::number(truth[sampleIndex].file.points().size()));
  1110 + }
  1111 +
  1112 + // Get best and worst performing examples
  1113 + QList< QPair<float,int> > exampleIndices = Common::Sort(imageErrors,true);
  1114 +
  1115 + QScopedPointer<Transform> t(Transform::make("Open+Draw(rects=false)",NULL));
  1116 +
  1117 + for (int i=0; i<totalExamples; i++) {
  1118 + QString filePath = "landmarking_examples_truth/"+truth[exampleIndices[i].second].file.fileName();
  1119 + projectAndWrite(t.data(), truth[exampleIndices[i].second],filePath);
  1120 + lines.append("EXT,"+filePath+","+QString::number(exampleIndices[i].first));
  1121 +
  1122 + filePath = "landmarking_examples_predicted/"+predicted[exampleIndices[i].second].file.fileName();
  1123 + projectAndWrite(t.data(), predicted[exampleIndices[i].second],filePath);
  1124 + lines.append("EXP,"+filePath+","+QString::number(exampleIndices[i].first));
  1125 + }
  1126 +
  1127 + for (int i=exampleIndices.size()-1; i>exampleIndices.size()-totalExamples-1; i--) {
  1128 + QString filePath = "landmarking_examples_truth/"+truth[exampleIndices[i].second].file.fileName();
  1129 + projectAndWrite(t.data(), truth[exampleIndices[i].second],filePath);
  1130 + lines.append("EXT,"+filePath+","+QString::number(exampleIndices[i].first));
  1131 +
  1132 + filePath = "landmarking_examples_predicted/"+predicted[exampleIndices[i].second].file.fileName();
  1133 + projectAndWrite(t.data(), predicted[exampleIndices[i].second],filePath);
  1134 + lines.append("EXP,"+filePath+","+QString::number(exampleIndices[i].first));
  1135 + }
  1136 +
1079 1137 for (int i=0; i<pointErrors.size(); i++) {
  1138 + std::sort(pointErrors[i].begin(), pointErrors[i].end());
  1139 + averagePointErrors.append(Common::Mean(pointErrors[i]));
1080 1140 const QList<float> &pointError = pointErrors[i];
1081 1141 const int keep = qMin(Max_Points, pointError.size());
1082 1142 for (int j=0; j<keep; j++)
1083 1143 lines.append(QString("Box,%1,%2").arg(QString::number(i), QString::number(pointError[j*(pointError.size()-1)/(keep-1)])));
1084 1144 }
1085 1145  
  1146 + const float averagePointError = Common::Mean(averagePointErrors);
  1147 +
1086 1148 lines.append(QString("AvgError,0,%1").arg(averagePointError));
  1149 + lines.append(QString("NormLength,0,%1").arg(Common::Mean(normalizedLengths)));
1087 1150  
1088 1151 QtUtils::writeFile(csv, lines);
1089   - qDebug("Average Error: %.3f", averagePointError);
  1152 +
  1153 + qDebug("Average Error for all Points: %.3f", averagePointError);
  1154 +
1090 1155 return averagePointError;
1091 1156 }
1092 1157  
... ...
openbr/core/eval.h
  View file @22690ec
... ... @@ -31,7 +31,7 @@ namespace br
31 31  
32 32 void EvalClassification(const QString &predictedGallery, const QString &truthGallery, QString predictedProperty = "", QString truthProperty = "");
33 33 float EvalDetection(const QString &predictedGallery, const QString &truthGallery, const QString &csv = "", bool normalize = false, int minSize = 0, int maxSize = 0); // Return average overlap
34   - float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv = "", int normalizationIndexA = 0, int normalizationIndexB = 1); // Return average error
  34 + float EvalLandmarking(const QString &predictedGallery, const QString &truthGallery, const QString &csv = "", int normalizationIndexA = 0, int normalizationIndexB = 1, int sampleIndex = 0, int totalExamples = 5); // Return average error
35 35 void EvalRegression(const QString &predictedGallery, const QString &truthGallery, QString predictedProperty = "", QString truthProperty = "");
36 36 }
37 37  
... ...
openbr/core/plot.cpp
  View file @22690ec
... ... @@ -470,16 +470,115 @@ bool PlotLandmarking(const QStringList &amp;files, const File &amp;destination, bool sho
470 470 qDebug("Plotting %d landmarking file(s) to %s", files.size(), qPrintable(destination));
471 471 RPlot p(files, destination, false);
472 472  
473   - p.file.write("# Split data into individual plots\n"
474   - "plot_index = which(names(data)==\"Plot\")\n"
475   - "Box <- data[grep(\"Box\",data$Plot),-c(1)]\n"
476   - "rm(data)\n"
477   - "\n");
478   -
479   - p.file.write(qPrintable(QString("ggplot(Box, aes(Y,%1%2))").arg(p.major.size > 1 ? QString(", colour=%1").arg(p.major.header) : QString(), p.minor.size > 1 ? QString(", linetype=%1").arg(p.minor.header) : QString()) +
  473 + p.file.write(qPrintable(QString("# Split data into individual plots\n"
  474 + "plot_index = which(names(data)==\"Plot\")\n"
  475 + "Box <- data[grep(\"Box\",data$Plot),-c(1)]\n"
  476 + "Box$X <- factor(Box$X, levels = Box$X, ordered = TRUE)\n"
  477 + "Sample <- data[grep(\"Sample\",data$Plot),-c(1)]\n"
  478 + "Sample$X <- as.character(Sample$X)\n"
  479 + "EXT <- data[grep(\"EXT\",data$Plot),-c(1)]\n"
  480 + "EXT$X <- as.character(EXT$X)\n"
  481 + "EXP <- data[grep(\"EXP\",data$Plot),-c(1)]\n"
  482 + "EXP$X <- as.character(EXP$X)\n"
  483 + "NormLength <- data[grep(\"NormLength\",data$Plot),-c(1)]\n"
  484 + "rm(data)\n"
  485 + "\n")));
  486 +
  487 + p.file.write(qPrintable(QString("summarySE <- function(data=NULL, measurevar, groupvars=NULL, na.rm=FALSE, conf.interval=.95, .drop=TRUE) {\n\t"
  488 + "require(plyr)\n\n\tlength2 <- function (x, na.rm=FALSE) {\n\t\tif (na.rm) sum(!is.na(x))\n\t\telse length(x)"
  489 + "\n\t}\n\n\tdatac <- ddply(data, groupvars, .drop=.drop, .fun = function(xx, col) {\n\t\t"
  490 + "c(N=length2(xx[[col]], na.rm=na.rm), mean=mean(xx[[col]], na.rm=na.rm), sd=sd(xx[[col]], na.rm=na.rm))\n\t\t},"
  491 + "\n\t\tmeasurevar\n\t)\n\n\tdatac <- rename(datac, c(\"mean\" = measurevar))\n\tdatac$se <- datac$sd / sqrt(datac$N)"
  492 + "\n\tciMult <- qt(conf.interval/2 + .5, datac$N-1)\n\tdatac$ci <- datac$se * ciMult\n\n\treturn(datac)\n}\n")));
  493 +
  494 +
  495 + p.file.write(qPrintable(QString("\nreadData <- function(data) {\n\texamples <- list()\n"
  496 + "\tfor (i in 1:nrow(data)) {\n"
  497 + "\t\tpath <- data[i,1]\n"
  498 + "\t\tvalue <- data[i,2]\n"
  499 + "\t\tfile <- unlist(strsplit(path, \"[.]\"))[1]\n"
  500 + "\t\text <- unlist(strsplit(path, \"[.]\"))[2]\n"
  501 + "\t\tif (ext == \"jpg\" || ext == \"JPEG\" || ext == \"jpeg\" || ext == \"JPG\") {\n"
  502 + "\t\t\timg <- readJPEG(path)\n"
  503 + "\t\t} else if (ext == \"PNG\" || ext == \"png\") {\n"
  504 + "\t\t\timg <- readPNG(path)\n"
  505 + "\t\t} else if (ext == \"TIFF\" || ext == \"tiff\" || ext == \"TIF\" || ext == \"tif\") { \n"
  506 + "\t\t\timg <- readTIFF(path)\n"
  507 + "}else {\n"
  508 + "\t\t\tnext\n"
  509 + "\t\t}\n"
  510 + "\t\texample <- list(file = file, value = value, image = img)\n"
  511 + "\t\texamples[[i]] <- example\n"
  512 + "\t}\n"
  513 + "\treturn(examples)\n"
  514 + "}\n")));
  515 +
  516 + p.file.write(qPrintable(QString("\nlibrary(jpeg)\n"
  517 + "library(png)\n"
  518 + "library(grid)\n"
  519 + "multiplot <- function(..., plotlist=NULL, cols) {\n"
  520 + "\trequire(grid)\n"
  521 + "\t# Make a list from the ... arguments and plotlist\n"
  522 + "\tplots <- c(list(...), plotlist)\n"
  523 + "\tnumPlots = length(plots)\n"
  524 + "\t# Make the panel\n"
  525 + "\tplotCols = cols\n"
  526 + "\tplotRows = ceiling(numPlots/plotCols)\n"
  527 + "\t# Set up the page\n"
  528 + "\tgrid.newpage()\n"
  529 + "\tpushViewport(viewport(layout = grid.layout(plotRows, plotCols)))\n"
  530 + "\tvplayout <- function(x, y)\n"
  531 + "\tviewport(layout.pos.row = x, layout.pos.col = y)\n"
  532 + "\t# Make each plot, in the correct location\n"
  533 + "\tfor (i in 1:numPlots) {\n"
  534 + "\t\tcurRow = ceiling(i/plotCols)\n"
  535 + "\t\tcurCol = (i-1) %% plotCols + 1\n"
  536 + "\t\tprint(plots[[i]], vp = vplayout(curRow, curCol))\n"
  537 + "\t}\n"
  538 + "}\n")));
  539 +
  540 + p.file.write(qPrintable(QString("\nplotImage <- function(image, title=NULL, label=NULL) { \n"
  541 + "\tp <- qplot(1:10, 1:10, geom=\"blank\") + annotation_custom(rasterGrob(image$image), xmin=-Inf, xmax=Inf, ymin=-Inf, ymax=Inf) + theme(axis.line=element_blank(), axis.title.y=element_blank(), axis.text.x=element_blank(), axis.text.y=element_blank(), line=element_blank(), axis.ticks=element_blank(), panel.background=element_blank()) + labs(title=title) + xlab(label)\n"
  542 + "\treturn(p)"
  543 + "}\n")));
  544 +
  545 + p.file.write(qPrintable(QString("\nsample <- readData(Sample) \n"
  546 + "rows <- sample[[1]]$value\n"
  547 + "algs <- unique(Box$%1)\n"
  548 + "algs <- algs[!duplicated(algs)]\n"
  549 + "print(plotImage(sample[[1]],\"Sample Landmarks\",sprintf(\"Total Landmarks: %s\",sample[[1]]$value))) \n"
  550 + "if (nrow(EXT) != 0 && nrow(EXP)) {\n"
  551 + "\tfor (j in 1:length(algs)) {\n"
  552 + "\ttruthSample <- readData(EXT[EXT$. == algs[[j]],])\n"
  553 + "\tpredictedSample <- readData(EXP[EXP$. == algs[[j]],])\n"
  554 + "\t\tfor (i in 1:length(predictedSample)) {\n"
  555 + "\t\t\tmultiplot(plotImage(predictedSample[[i]],sprintf(\"%s\\nPredicted Landmarks\",algs[[j]]),sprintf(\"Average Landmark Error: %.3f\",predictedSample[[i]]$value)),plotImage(truthSample[[i]],\"Ground Truth\\nLandmarks\",\"\"),cols=2)\n"
  556 + "\t\t}\n"
  557 + "\t}\n"
  558 + "}\n").arg(p.major.size > 1 ? p.major.header : (p.minor.header.isEmpty() ? p.major.header : p.minor.header))));
  559 +
  560 + p.file.write(qPrintable(QString("\n"
  561 + "# Code to format error table\n"
  562 + "StatBox <- summarySE(Box, measurevar=\"Y\", groupvars=c(\"%1\",\"X\"))\n"
  563 + "OverallStatBox <- summarySE(Box, measurevar=\"Y\", groupvars=c(\"%1\"))\n"
  564 + "mat <- matrix(paste(as.character(round(StatBox$Y, 3)), round(StatBox$ci, 3), sep=\" \\u00b1 \"),nrow=rows,ncol=length(algs),byrow=FALSE)\n"
  565 + "mat <- rbind(mat, paste(as.character(round(OverallStatBox$Y, 3)), round(OverallStatBox$ci, 3), sep=\" \\u00b1 \"))\n"
  566 + "mat <- rbind(mat, as.character(round(NormLength$Y, 3)))\n"
  567 + "colnames(mat) <- algs\n"
  568 + "rownames(mat) <- c(seq(0,rows-1),\"Aggregate\",\"Average IPD\")\n"
  569 + "ETable <- as.table(mat)\n").arg(p.major.size > 1 ? p.major.header : (p.minor.header.isEmpty() ? p.major.header : p.minor.header))));
  570 +
  571 + p.file.write(qPrintable(QString("\n"
  572 + "print(textplot(ETable))\n"
  573 + "print(title(\"Landmarking Error Rates\"))\n")));
  574 +
  575 + p.file.write(qPrintable(QString("ggplot(Box, aes(Y,%1%2))").arg(p.major.size > 1 ? QString(", colour=%1").arg(p.major.header) : QString(),
  576 + p.minor.size > 1 ? QString(", linetype=%1").arg(p.minor.header) : QString()) +
480 577 QString(" + annotation_logticks(sides=\"b\") + stat_ecdf() + scale_x_log10(\"Normalized Error\", breaks=c(0.001,0.01,0.1,1,10)) + scale_y_continuous(\"Cumulative Density\", label=percent) + theme_minimal()\n\n")));
  578 +
481 579 p.file.write(qPrintable(QString("ggplot(Box, aes(factor(X), Y%1%2))").arg(p.major.size > 1 ? QString(", colour=%1").arg(p.major.header) : QString(), p.minor.size > 1 ? QString(", linetype=%1").arg(p.minor.header) : QString()) +
482   - QString("+ annotation_logticks(sides=\"l\") + geom_boxplot(alpha=0.5) + geom_jitter(size=1, alpha=0.5) + scale_x_discrete(\"Landmark\") + scale_y_log10(\"Normalized Error\", breaks=c(0.01,0.1,1,10)) + theme_minimal()\n\n")));
  580 + QString("+ annotation_logticks(sides=\"l\") + geom_boxplot(alpha=0.5) + geom_jitter(size=1, alpha=0.5) + scale_x_discrete(\"Landmark\") + scale_y_log10(\"Normalized Error\", breaks=c(0.001,0.01,0.1,1,10)) + theme_minimal()\n\n")));
  581 +
483 582 p.file.write(qPrintable(QString("ggplot(Box, aes(factor(X), Y%1%2))").arg(p.major.size > 1 ? QString(", colour=%1").arg(p.major.header) : QString(), p.minor.size > 1 ? QString(", linetype=%1").arg(p.minor.header) : QString()) +
484 583 QString("+ annotation_logticks(sides=\"l\") + geom_violin(alpha=0.5) + scale_x_discrete(\"Landmark\") + scale_y_log10(\"Normalized Error\", breaks=c(0.001,0.01,0.1,1,10))\n\n")));
485 584  
... ...
openbr/openbr.cpp
  View file @22690ec
... ... @@ -134,9 +134,9 @@ float br_eval_detection(const char *predicted_gallery, const char *truth_gallery
134 134 return EvalDetection(predicted_gallery, truth_gallery, csv, normalize, minSize, maxSize);
135 135 }
136 136  
137   -float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv, int normalization_index_a, int normalization_index_b)
  137 +float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv, int normalization_index_a, int normalization_index_b, int sample_index, int total_examples)
138 138 {
139   - return EvalLandmarking(predicted_gallery, truth_gallery, csv, normalization_index_a, normalization_index_b);
  139 + return EvalLandmarking(predicted_gallery, truth_gallery, csv, normalization_index_a, normalization_index_b, sample_index, total_examples);
140 140 }
141 141  
142 142 void br_eval_regression(const char *predicted_gallery, const char *truth_gallery, const char *predicted_property, const char *truth_property)
... ...
openbr/openbr.h
  View file @22690ec
... ... @@ -214,8 +214,10 @@ BR_EXPORT float br_eval_detection(const char *predicted_gallery, const char *tru
214 214 * \param csv Optional \c .csv file to contain performance metrics.
215 215 * \param normalization_index_a Optional first index in the list of points to use for normalization.
216 216 * \param normalization_index_b Optional second index in the list of points to use for normalization.
  217 + * \param sample_index Optional index for sample landmark image in ground truth gallery.
  218 + * \param total_examples Optional number of accurate and inaccurate examples to display.
217 219 */
218   -BR_EXPORT float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv = "", int normalization_index_a = 0, int normalization_index_b = 1);
  220 +BR_EXPORT float br_eval_landmarking(const char *predicted_gallery, const char *truth_gallery, const char *csv = "", int normalization_index_a = 0, int normalization_index_b = 1, int sample_index = 0, int total_examples = 5);
219 221  
220 222 /*!
221 223 * \brief Evaluates regression accuracy to disk.
... ...
openbr/plugins/draw.cpp
  View file @22690ec
... ... @@ -42,11 +42,15 @@ class DrawTransform : public UntrainableTransform
42 42 Q_PROPERTY(bool rects READ get_rects WRITE set_rects RESET reset_rects STORED false)
43 43 Q_PROPERTY(bool inPlace READ get_inPlace WRITE set_inPlace RESET reset_inPlace STORED false)
44 44 Q_PROPERTY(int lineThickness READ get_lineThickness WRITE set_lineThickness RESET reset_lineThickness STORED false)
  45 + Q_PROPERTY(bool named READ get_named WRITE set_named RESET reset_named STORED false)
  46 + Q_PROPERTY(bool location READ get_location WRITE set_location RESET reset_location STORED false)
45 47 BR_PROPERTY(bool, verbose, false)
46 48 BR_PROPERTY(bool, points, true)
47 49 BR_PROPERTY(bool, rects, true)
48 50 BR_PROPERTY(bool, inPlace, false)
49 51 BR_PROPERTY(int, lineThickness, 1)
  52 + BR_PROPERTY(bool, named, true)
  53 + BR_PROPERTY(bool, location, true)
50 54  
51 55 void project(const Template &src, Template &dst) const
52 56 {
... ... @@ -55,11 +59,12 @@ class DrawTransform : public UntrainableTransform
55 59 dst.m() = inPlace ? src.m() : src.m().clone();
56 60  
57 61 if (points) {
58   - const QList<Point2f> pointsList = OpenCVUtils::toPoints(src.file.namedPoints() + src.file.points());
  62 + const QList<Point2f> pointsList = (named) ? OpenCVUtils::toPoints(src.file.points()+src.file.namedPoints()) : OpenCVUtils::toPoints(src.file.points());
59 63 for (int i=0; i<pointsList.size(); i++) {
60 64 const Point2f &point = pointsList[i];
61 65 circle(dst, point, 3, color, -1);
62   - if (verbose) putText(dst, QString("%1,(%2,%3)").arg(QString::number(i),QString::number(point.x),QString::number(point.y)).toStdString(), point, FONT_HERSHEY_SIMPLEX, 0.5, verboseColor, 1);
  66 + QString label = (location) ? QString("%1,(%2,%3)").arg(QString::number(i),QString::number(point.x),QString::number(point.y)) : QString("%1").arg(QString::number(i));
  67 + if (verbose) putText(dst, label.toStdString(), point, FONT_HERSHEY_SIMPLEX, 0.5, verboseColor, 1);
63 68 }
64 69 }
65 70 if (rects) {
... ...