Peter M. Groen / openbr

Commit edbb16c99580ab1037c169258aa1af77bbe11f92

Authored by Josh Klontz
1 parent 58721e7e

improved plots

Inline Side-by-side
Showing 1 changed file with 9 additions and 5 deletions
openbr/core/plot.cpp
  View file @edbb16c
... ... @@ -382,7 +382,11 @@ struct RPlot
382 382 "ERR$Y <- as.numeric(as.character(ERR$Y))\n"
383 383 "SD$Y <- as.factor(unique(as.character(SD$Y)))\n"
384 384 "BC$Y <- as.numeric(as.character(BC$Y))\n"
385   - "CMC$Y <- as.numeric(as.character(CMC$Y))\n");
  385 + "CMC$Y <- as.numeric(as.character(CMC$Y))\n"
  386 + "\n"
  387 + "# Code to format FAR values\n"
  388 + "far_names <- list('0.001'=\"FAR = 0.1%\", '0.01'=\"FAR = 1%\")\n"
  389 + "far_labeller <- function(variable,value) { return(far_names[as.character(value)]) }\n");
386 390  
387 391 // Open output device
388 392 file.write(qPrintable(QString("\n"
... ... @@ -461,7 +465,7 @@ bool Plot(const QStringList &amp;files, const br::File &amp;destination, bool show)
461 465 QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_minimal()") +
462 466 (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) +
463 467 (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
464   - QString(" + scale_x_log10() + scale_y_continuous(labels=percent)") +
  468 + QString(" + scale_x_log10(labels=percent) + scale_y_continuous(labels=percent) + annotation_logticks(sides=\"b\")") +
465 469 QString("\nggsave(\"%1\")\n").arg(p.subfile("ROC"))));
466 470  
467 471 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\"") +
... ... @@ -470,7 +474,7 @@ bool Plot(const QStringList &amp;files, const br::File &amp;destination, bool show)
470 474 QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_minimal()") +
471 475 (p.major.size > 1 ? getScale("colour", p.major.header, p.major.size) : QString()) +
472 476 (p.minor.size > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minor.header) : QString()) +
473   - QString(" + scale_x_log10() + scale_y_log10()") +
  477 + QString(" + scale_x_log10(labels=percent) + scale_y_log10(labels=percent) + annotation_logticks()") +
474 478 QString("\nggsave(\"%1\")\n").arg(p.subfile("DET"))));
475 479  
476 480 p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") +
... ... @@ -495,7 +499,7 @@ bool Plot(const QStringList &amp;files, const br::File &amp;destination, bool show)
495 499 QString(", xlab=\"%1False Accept Rate\"").arg(p.major.size > 1 ? p.major.header + " / " : QString()) +
496 500 QString(", ylab=\"True Accept Rate%1\") + theme_minimal()").arg(p.minor.size > 1 ? " / " + p.minor.header : QString()) +
497 501 (p.major.size > 1 ? getScale("fill", p.major.header, p.major.size) : QString()) +
498   - (p.minor.size > 1 ? QString(" + facet_grid(%2 ~ X)").arg(p.minor.header) : QString(" + facet_wrap(~ X)")) +
  502 + (p.minor.size > 1 ? QString(" + facet_grid(%2 ~ X)").arg(p.minor.header) : QString(" + facet_grid(. ~ X, labeller=far_labeller)")) +
499 503 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))") +
500 504 QString("\nggsave(\"%1\")\n").arg(p.subfile("BC"))));
501 505  
... ... @@ -503,7 +507,7 @@ bool Plot(const QStringList &amp;files, const br::File &amp;destination, bool show)
503 507 ((p.flip ? p.major.size : p.minor.size) > 1 ? QString(", colour=factor(%1)").arg(p.flip ? p.major.header : p.minor.header) : QString()) +
504 508 QString(", xlab=\"Score%1\", ylab=\"Error Rate\") + theme_minimal()").arg((p.flip ? p.minor.size : p.major.size) > 1 ? " / " + (p.flip ? p.minor.header : p.major.header) : QString()) +
505 509 ((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()) +
506   - QString(" + scale_y_log10()") +
  510 + QString(" + scale_y_log10(labels=percent) + annotation_logticks(sides=\"l\")") +
507 511 ((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()) +
508 512 QString(" + theme(aspect.ratio=1)") +
509 513 QString("\nggsave(\"%1\")\n").arg(p.subfile("ERR"))));
... ...