Peter M. Groen / openbr

Commit caaa67d41c6687dc4a1143cfee8b3d1dda611ef4

Authored by Josh Klontz
1 parent 88cbcc4f

reordered ROC plot

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
sdk/core/plot.cpp
  View file @caaa67d
@@ -428,23 +428,23 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -428,23 +428,23 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
428 428
429 RPlot p(files, destination); 429 RPlot p(files, destination);
430 430
431 - p.file.write(qPrintable(QString("qplot(X, Y, data=DET, geom=\"line\"") + 431 + p.file.write(qPrintable(QString("qplot(X, 1-Y, data=DET, geom=\"line\"") +
432 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) + 432 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) +
433 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) + 433 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) +
434 - QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_minimal()") + 434 + QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_minimal()") +
435 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) + 435 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) +
436 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) + 436 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) +
437 - QString(" + scale_x_continuous(trans=\"log10\") + scale_y_continuous(trans=\"log10\")") +  
438 - QString("\nggsave(\"%1\")\n").arg(p.subfile("DET")))); 437 + QString(" + scale_x_log10() + scale_y_continuous(labels=percent)") +
  438 + QString("\nggsave(\"%1\")\n").arg(p.subfile("ROC"))));
439 439
440 - p.file.write(qPrintable(QString("qplot(X, 1-Y, data=DET, geom=\"line\"") + 440 + p.file.write(qPrintable(QString("qplot(X, Y, data=DET, geom=\"line\"") +
441 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) + 441 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) +
442 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) + 442 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) +
443 - QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_minimal()") + 443 + QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_minimal()") +
444 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) + 444 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) +
445 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) + 445 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) +
446 - QString(" + scale_x_continuous(trans=\"log10\") + scale_y_continuous(labels=percent)") +  
447 - QString("\nggsave(\"%1\")\n").arg(p.subfile("ROC")))); 446 + QString(" + scale_x_log10() + scale_y_log10()") +
  447 + QString("\nggsave(\"%1\")\n").arg(p.subfile("DET"))));
448 448
449 p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") + 449 p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") +
450 QString(", xlab=\"Score%1\"").arg((p.flip ? p.majorSize : p.minorSize) > 1 ? " / " + (p.flip ? p.majorHeader : p.minorHeader) : QString()) + 450 QString(", xlab=\"Score%1\"").arg((p.flip ? p.majorSize : p.minorSize) > 1 ? " / " + (p.flip ? p.majorHeader : p.minorHeader) : QString()) +