diff --git a/VERSION b/VERSION index 17e51c3..d917d3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.1 +0.1.2 diff --git a/ervx b/ervx index 3fa3d87..90f6b17 100755 --- a/ervx +++ b/ervx @@ -23,7 +23,7 @@ import argparse # potential python3 3rd party package, added in python/3.5 # Pipeline Metadata and globals __author__ = 'Skyler Kuhn' -__version__ = 'v0.1.1' +__version__ = 'v0.1.2' __email__ = 'kuhnsa@nih.gov' __home__ = os.path.dirname(os.path.abspath(__file__)) _name = os.path.basename(sys.argv[0]) diff --git a/workflow/scripts/telescope_count_merge.R b/workflow/scripts/telescope_count_merge.R index 9f23c67..dd2244f 100644 --- a/workflow/scripts/telescope_count_merge.R +++ b/workflow/scripts/telescope_count_merge.R @@ -39,8 +39,11 @@ print("LIST:") print(l) print("List Length:") print(length(l)) -counts_merged <- Reduce(function (...) { merge(..., all = FALSE, by = "transcript") }, # Inner join - l) +# Merge per-sample counts using a full +# outer join and set missing values to 0 +counts_merged <- Reduce(function (...) { merge(..., all = TRUE, by = "transcript") }, l) +counts_merged[is.na(counts_merged)] <- 0 + if (is.null(family_anno_table)){ write.csv(counts_merged, paste0(out_dir,"/counts.csv"), row.names=FALSE) } else {