Merge pull request #39 from dpryan79/fix38

Fix #38, the --methylKit option should produce values between 0-100, …
dpryan79 · Jan 27, 2017 · ddcc9c0 · ddcc9c0
2 parents ecef0ea + a14b33a
commit ddcc9c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+Version 0.2.1:
+
+   * The `--methylKit` option output methylation values between 0-1 rather than 0-100. This has been corrected.
+
 Version 0.2.0:
 
    * Changed the package name from PileOMeth to MethylDackel. It is unfortunate that the temporary "PileOMeth" name stuck around for so long.

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ OPTS ?= -Wall -g -O3
 all: lib MethylDackel
 
 OBJS = common.o bed.o svg.o pileup.o extract.o MBias.o mergeContext.o
-VERSION = 0.2.0
+VERSION = 0.2.1
 
 #If we're building from a git repo, then append the most recent tag
 ifneq "$(wildcard .git)" ""

diff --git a/extract.c b/extract.c
@@ -59,15 +59,15 @@ void writeCall(FILE *of, Config *config, char *chrom, int32_t pos, int32_t width
             logit(((double) nmethyl)/(nmethyl+nunmethyl)));
     } else if(config->methylKit) {
         fprintf(of, \
-            "%s.%i\t%s\t%i\t%c\t%i\t%f\t%f\n", \
+            "%s.%i\t%s\t%i\t%c\t%i\t%6.2f\t%6.2f\n", \
             chrom, \
             pos+1, \
             chrom, \
             pos+1, \
             strand, \
             nmethyl+nunmethyl, \
-            ((double) nmethyl)/(nmethyl+nunmethyl), \
-            ((double) nunmethyl)/(nmethyl+nunmethyl));
+            100.0 * ((double) nmethyl)/(nmethyl+nunmethyl), \
+            100.0 * ((double) nunmethyl)/(nmethyl+nunmethyl));
     }
 }