From cccd07cf14a62868443d1ba71803ad266aac6192 Mon Sep 17 00:00:00 2001 From: pjvan_thof Date: Wed, 26 Jul 2017 14:27:11 +0200 Subject: [PATCH] Sorting table correctly now --- .../broadinstitute/gatk/queue/util/queueJobReport.R | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/biopet-core/src/main/resources/org/broadinstitute/gatk/queue/util/queueJobReport.R b/biopet-core/src/main/resources/org/broadinstitute/gatk/queue/util/queueJobReport.R index c10b06863..135247aae 100644 --- a/biopet-core/src/main/resources/org/broadinstitute/gatk/queue/util/queueJobReport.R +++ b/biopet-core/src/main/resources/org/broadinstitute/gatk/queue/util/queueJobReport.R @@ -265,14 +265,16 @@ plotJobsGantt(merged.by.scatter, F, "Jobs merged by scatter by start time", T) merged.as.df = do.call(rbind.data.frame, merged.by.scatter)[,c("analysisName", "runtime", "cores")] merged.as.df$cputime = merged.as.df$runtime * merged.as.df$cores -merged.as.df$percent = merged.as.df$cputime / sum(merged.as.df$cputime) * 100 +merged.as.df$percent = merged.as.df$runtime / sum(merged.as.df$runtime) * 100 +merged.as.df$percentCpu = merged.as.df$cputime / sum(merged.as.df$cputime) * 100 merged.as.df.formatted = data.frame( analysisName=merged.as.df$analysisName, - walltime=prettyNum(merged.as.df$runtime), + walltime=prettyNum(merged.as.df$runtime), + percent=prettyNum(merged.as.df$percent,digits=2), cores=merged.as.df$cores, cputime=prettyNum(merged.as.df$cputime), - percent=prettyNum(merged.as.df$percent,digits=2)) -textplot(merged.as.df.formatted[order(merged.as.df$runtime),], show.rownames=F) + percentCpu=prettyNum(merged.as.df$percentCpu,digits=2)) +textplot(merged.as.df.formatted[order(merged.as.df$percentCpu),], show.rownames=F) title("Total runtime for each analysis") -- GitLab