From c83448b3bdf83ad019407534af9fbd8722547bad Mon Sep 17 00:00:00 2001
From: Steven Holte <holte@google.com>
Date: Tue, 30 Aug 2016 15:06:15 -0700
Subject: [PATCH] Tolerate extra empty columns

---
 analysis/R/read_input.R | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/analysis/R/read_input.R b/analysis/R/read_input.R
index 47f8be5d..f65518c1 100755
--- a/analysis/R/read_input.R
+++ b/analysis/R/read_input.R
@@ -67,9 +67,17 @@ ReadCountsFile <- function(counts_file, params, adjust_counts = FALSE) {
                  nrow(counts), params$m))
   }
 
-  if ((ncol(counts) - 1) != params$k) {
-    stop(paste0("Counts file: number of columns should equal to k + 1: ",
-                ncol(counts)))
+  # Tolerate extra empty columns
+  if (ncol(counts) > (params$k + 1)) {
+    extra <- counts[,(params$k + 2):ncol(counts)]
+    if (all(extra == 0)) {
+      counts <- counts[,1:(params$k + 1)]
+    }
+  }
+
+  if (ncol(counts) != params$k + 1) {
+    stop(sprintf("Counts file: Got %d columns, expected k + 1 = %d",
+                 ncol(counts), params$k + 1))
   }
 
   if (any(counts < 0)) {