From 782b5bcfe4eb21717a477fa3cd6c54e14ebe7e0a Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Sun, 14 Apr 2013 18:03:00 -0400 Subject: [PATCH] removed unnecessary eval/plot functionality --- openbr/core/plot.cpp | 37 +++++++------------------------------ openbr/openbr.h | 5 ++--- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/openbr/core/plot.cpp b/openbr/core/plot.cpp index 193ad6b..c0e3c4d 100644 --- a/openbr/core/plot.cpp +++ b/openbr/core/plot.cpp @@ -173,7 +173,6 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) // Sort comparisons by simmat_val (score) std::sort(comparisons.begin(), comparisons.end()); - double genuineSum = 0, impostorSum = 0; QList operatingPoints; QList genuines, impostors; QVector firstGenuineReturns(simmat.rows, 0); @@ -192,7 +191,6 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) const Comparison &comparison = comparisons[index]; if (comparison.genuine) { truePositives++; - genuineSum += comparison.score; genuines.append(comparison.score); if (firstGenuineReturns[comparison.query] < 1) firstGenuineReturns[comparison.query] = abs(firstGenuineReturns[comparison.query]) + 1; @@ -201,7 +199,6 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) minGenuineScore = comparison.score; } else { falsePositives++; - impostorSum += comparison.score; impostors.append(comparison.score); if (firstGenuineReturns[comparison.query] < 1) firstGenuineReturns[comparison.query]--; @@ -247,7 +244,6 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) QString::number(1-operatingPoint.TAR))); } - // Write FAR/TAR Bar Chart (BC) lines.append(qPrintable(QString("BC,0.001,%1").arg(QString::number(getTAR(operatingPoints, 0.001), 'f', 3)))); lines.append(qPrintable(QString("BC,0.01,%1").arg(QString::number(result = getTAR(operatingPoints, 0.01), 'f', 3)))); @@ -267,14 +263,6 @@ float Evaluate(const Mat &simmat, const Mat &mask, const QString &csv) sampledImpostorScores.append(impostorScore); } - const double hGenuine = Common::KernelDensityBandwidth(sampledGenuineScores); - foreach (double f, sampledGenuineScores) - lines.append(QString("KDEGenuine,%1,%2").arg(QString::number(f), QString::number(Common::KernelDensityEstimation(sampledGenuineScores, f, hGenuine)))); - - const double hImpostor = Common::KernelDensityBandwidth(sampledImpostorScores); - foreach (double f, sampledImpostorScores) - lines.append(QString("KDEImpostor,%1,%2").arg(QString::number(f), QString::number(Common::KernelDensityEstimation(sampledImpostorScores, f, hImpostor)))); - // Write Cumulative Match Characteristic (CMC) curve const int Max_Retrieval = 100; const int Report_Retrieval = 5; @@ -477,11 +465,6 @@ struct RPlot if (success && show) QtUtils::showFile(basename+"."+suffix); return success; } - - QString subfile(const QString &name) const - { - return basename+"_"+name+"."+suffix; - } }; bool Plot(const QStringList &files, const br::File &destination, bool show) @@ -498,8 +481,7 @@ bool Plot(const QStringList &files, const br::File &destination, bool show) QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_minimal()") + (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) + (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) + - QString(" + scale_x_log10(labels=percent) + scale_y_continuous(labels=percent) + annotation_logticks(sides=\"b\")") + - QString("\nggsave(\"%1\")\n\n").arg(p.subfile("ROC")))); + QString(" + scale_x_log10(labels=percent) + scale_y_continuous(labels=percent) + annotation_logticks(sides=\"b\")\n\n"))); p.file.write(qPrintable(QString("qplot(X, Y, data=DET%1").arg((p.major.smooth || p.minor.smooth) ? ", geom=\"smooth\", method=loess, level=0.99" : ", geom=\"line\"") + (p.major.size > 1 ? QString(", colour=factor(%1)").arg(p.major.header) : QString()) + @@ -507,24 +489,21 @@ bool Plot(const QStringList &files, const br::File &destination, bool show) QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_minimal()") + (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) + (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) + - QString(" + scale_x_log10(labels=percent) + scale_y_log10(labels=percent) + annotation_logticks()") + - QString("\nggsave(\"%1\")\n\n").arg(p.subfile("DET")))); + QString(" + scale_x_log10(labels=percent) + scale_y_log10(labels=percent) + annotation_logticks()\n\n"))); p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") + QString(", xlab=\"Score%1\"").arg((p.flip ? p.major.size : p.minor.size) > 1 ? " / " + (p.flip ? p.major.header : p.minor.header) : QString()) + QString(", ylab=\"Frequency%1\"").arg((p.flip ? p.minor.size : p.major.size) > 1 ? " / " + (p.flip ? p.minor.header : p.major.header) : QString()) + QString(") + scale_fill_manual(\"Ground Truth\", values=c(\"blue\", \"red\")) + theme_minimal() + scale_x_continuous(minor_breaks=NULL) + scale_y_continuous(minor_breaks=NULL) + theme(axis.text.y=element_blank(), axis.ticks=element_blank(), axis.text.x=element_text(angle=-90, hjust=0))") + (p.major.size > 1 ? (p.minor.size > 1 ? QString(" + facet_grid(%2 ~ %1, scales=\"free\")").arg((p.flip ? p.major.header : p.minor.header), (p.flip ? p.minor.header : p.major.header)) : QString(" + facet_wrap(~ %1, scales = \"free\")").arg(p.major.header)) : QString()) + - QString(" + theme(aspect.ratio=1)") + - QString("\nggsave(\"%1\")\n\n").arg(p.subfile("SD")))); + QString(" + theme(aspect.ratio=1)\n\n"))); p.file.write(qPrintable(QString("ggplot(CMC, aes(x=X, y=Y%1%2)) + xlab(\"Rank\") + ylab(\"Retrieval Rate\")").arg(p.major.size > 1 ? QString(" ,colour=factor(%1)").arg(p.major.header) : QString(), p.minor.size > 1 ? QString(", linetype=factor(%1)").arg(p.minor.header) : QString()) + ((p.major.smooth || p.minor.smooth) ? (minimalist ? " + stat_summary(geom=\"line\", fun.y=mean)" : " + stat_summary(geom=\"line\", fun.y=min, aes(linetype=\"Min/Max\")) + stat_summary(geom=\"line\", fun.y=max, aes(linetype=\"Min/Max\")) + stat_summary(geom=\"line\", fun.y=mean, aes(linetype=\"Mean\")) + scale_linetype_manual(\"Legend\", values=c(\"Mean\"=1, \"Min/Max\"=2))") : " + geom_line()") + - (minimalist ? "" : "+ scale_x_log10(labels=c(1,5,10,50,100), breaks=c(1,5,10,50,100)) + annotation_logticks(sides=\"b\")") + + (minimalist ? "" : " + scale_x_log10(labels=c(1,5,10,50,100), breaks=c(1,5,10,50,100)) + annotation_logticks(sides=\"b\")") + (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) + (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) + - QString(" + theme_minimal() + scale_y_continuous(labels=percent)") + - QString("\nggsave(\"%1\")\n\n").arg(p.subfile("CMC")))); + QString(" + theme_minimal() + scale_y_continuous(labels=percent)\n\n"))); p.file.write(qPrintable(QString("qplot(factor(%1)%2, data=BC, %3").arg(p.major.smooth ? (p.minor.header.isEmpty() ? "Algorithm" : p.minor.header) : p.major.header, (p.major.smooth || p.minor.smooth) ? ", Y" : "", (p.major.smooth || p.minor.smooth) ? "geom=\"boxplot\"" : "geom=\"bar\", position=\"dodge\", weight=Y") + (p.major.size > 1 ? QString(", fill=factor(%1)").arg(p.major.header) : QString()) + @@ -532,8 +511,7 @@ bool Plot(const QStringList &files, const br::File &destination, bool show) QString(", ylab=\"True Accept Rate%1\") + theme_minimal()").arg(p.minor.size > 1 ? " / " + p.minor.header : QString()) + (p.major.size > 1 ? getScale("fill", p.major.header, p.major.size) : QString()) + (p.minor.size > 1 ? QString(" + facet_grid(%2 ~ X)").arg(p.minor.header) : QString(" + facet_grid(. ~ X, labeller=far_labeller)")) + - QString(" + scale_y_continuous(labels=percent) + theme(legend.position=\"none\", axis.text.x=element_text(angle=-90, hjust=0))%1").arg((p.major.smooth || p.minor.smooth) ? "" : " + geom_text(data=BC, aes(label=Y, y=0.05))") + - QString("\nggsave(\"%1\")\n\n").arg(p.subfile("BC")))); + QString(" + scale_y_continuous(labels=percent) + theme(legend.position=\"none\", axis.text.x=element_text(angle=-90, hjust=0))%1").arg((p.major.smooth || p.minor.smooth) ? "" : " + geom_text(data=BC, aes(label=Y, y=0.05))\n\n"))); p.file.write(qPrintable(QString("qplot(X, Y, data=ERR%1, linetype=Error").arg((p.major.smooth || p.minor.smooth) ? ", geom=\"smooth\", method=loess, level=0.99" : ", geom=\"line\"") + ((p.flip ? p.major.size : p.minor.size) > 1 ? QString(", colour=factor(%1)").arg(p.flip ? p.major.header : p.minor.header) : QString()) + @@ -541,8 +519,7 @@ bool Plot(const QStringList &files, const br::File &destination, bool show) ((p.flip ? p.major.size : p.minor.size) > 1 ? getScale("colour", p.flip ? p.major.header : p.minor.header, p.flip ? p.major.size : p.minor.size) : QString()) + QString(" + scale_y_log10(labels=percent) + annotation_logticks(sides=\"l\")") + ((p.flip ? p.minor.size : p.major.size) > 1 ? QString(" + facet_wrap(~ %1, scales=\"free_x\")").arg(p.flip ? p.minor.header : p.major.header) : QString()) + - QString(" + theme(aspect.ratio=1)") + - QString("\nggsave(\"%1\")\n\n").arg(p.subfile("ERR")))); + QString(" + theme(aspect.ratio=1)\n\n"))); return p.finalize(show); } diff --git a/openbr/openbr.h b/openbr/openbr.h index 9cf5df7..31b1379 100644 --- a/openbr/openbr.h +++ b/openbr/openbr.h @@ -258,10 +258,9 @@ BR_EXPORT const char *br_objects(const char *abstractions = ".*", const char *im * -# Cumulative Match Characteristic (CMC) * -# Error Rate (ERR) curve * - * Several files will be created: + * Two files will be created: * - destination.R which is the auto-generated R script used to render the figures. - * - destination.pdf which has all of the figures in one file (convenient for attaching in an email). - * - destination_ROC.pdf, ..., destination_ERR.pdf which has each figure in a separate file (convenient for including in a presentation). + * - destination.pdf which has all of the figures in one file multi-page file. * * \param num_files Number of .csv files. * \param files .csv files created using \ref br_eval. -- libgit2 0.21.4