Oops, swapped the output order

Author: dpryan79

2bit.c

@@ -368,15 +368,17 @@ void *twobitBasesWorker(TwoBit *tb, uint32_t tid, uint32_t start, uint32_t end,
     }
     free(bytes);
 
+    //out is in TCAG order, since that's how 2bit is stored.
+    //However, for whatever reason I went with ACTG in the first release...
     if(fraction) {
-        ((double*) out)[0] = ((double) tmp[0])/((double) len);
+        ((double*) out)[0] = ((double) tmp[2])/((double) len);
         ((double*) out)[1] = ((double) tmp[1])/((double) len);
-        ((double*) out)[2] = ((double) tmp[2])/((double) len);
+        ((double*) out)[2] = ((double) tmp[0])/((double) len);
         ((double*) out)[3] = ((double) tmp[3])/((double) len);
     } else {
-        ((uint32_t*) out)[0] = tmp[0];
+        ((uint32_t*) out)[0] = tmp[2];
         ((uint32_t*) out)[1] = tmp[1];
-        ((uint32_t*) out)[2] = tmp[2];
+        ((uint32_t*) out)[2] = tmp[0];
         ((uint32_t*) out)[3] = tmp[3];
     }
 

test/test.py

@@ -2,18 +2,6 @@
 """
 The expected output is below:
 
-0	chr1	150 offset 0x4a
-1	chr2	100 offset 0x88
-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNACGTACGTACGTagctagctGATCGATCGTAGCTAGCTAGCTAGCTGATCNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-NNNNNNNNNNNNNNNNNNNNNNNNNNACGTACGTACGTagctagctGATC
-0	0.086667
-1	0.080000
-2	0.080000
-3	0.086667
-0	0.120000
-1	0.120000
-2	0.120000
-3	0.120000
 """
 from subprocess import Popen, PIPE, check_call
 from os import remove
@@ -27,6 +15,6 @@
 except:
     p2 = Popen(["md5"], stdin=p1.stdout, stdout=PIPE)
 md5sum = p2.communicate()[0].strip().split()[0]
-assert(md5sum == "55e28106e51c37e9191846f0b69a7b52")
+assert(md5sum == "0274c32c7f3dd75e8991f6107dca6a5f")
 
 print("Passed!")