button-up v21

cl and formatting
Illumina · May 9, 2014 · 3287f2d · 3287f2d
1 parent ca5cc3a
commit 3287f2d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,4 @@
+v0.21.0
 - MANTA-167 semi-mapped som pair correction
 - MANTA-156 filter out assm poison reads
 - MANTA-161 make assembly robust to seed k-mer selection

diff --git a/src/c++/lib/applications/GenerateSVCandidates/EdgeRetrieverJumpBin.hh b/src/c++/lib/applications/GenerateSVCandidates/EdgeRetrieverJumpBin.hh
@@ -59,5 +59,5 @@ private:
     // additional 'load balancing' structures:
     count_t _avgBinTotalCount;
 
-   std::vector<count_t> _binTotalCount;
+    std::vector<count_t> _binTotalCount;
 };
diff --git a/src/c++/lib/applications/GenerateSVCandidates/SVScorer.cpp b/src/c++/lib/applications/GenerateSVCandidates/SVScorer.cpp
@@ -711,7 +711,7 @@ getRefAltFromFrag(
     else
     {
         isPairUsable = ((fragev.read1.isScanned && fragev.read2.isScanned) &&
-                (fragev.read1.isAnchored(isPermissive) || fragev.read2.isAnchored(isPermissive)));
+                        (fragev.read1.isAnchored(isPermissive) || fragev.read2.isAnchored(isPermissive)));
     }
 
     if (isPairUsable)

diff --git a/src/c++/lib/assembly/SmallAssembler.cpp b/src/c++/lib/assembly/SmallAssembler.cpp
@@ -121,7 +121,8 @@ wordHashToDot(
         BOOST_FOREACH(const char symbol, alphabet)
         {
             const std::string newKey(addBase(tmp,symbol,isEnd));
-            if (wordCount.find(newKey) != wordCount.end()) {
+            if (wordCount.find(newKey) != wordCount.end())
+            {
                 os << aliasH[word] << " -- " << aliasH[newKey] << ";\n";
             }
         }
@@ -274,7 +275,7 @@ getKmerCounts(
             if (readWordOffset.find(word) != readWordOffset.end())
             {
 #ifdef DEBUG_ASBL
-                    log_os << logtag << "word " << word << " repeated in read " << readIndex << "\n";
+                log_os << logtag << "word " << word << " repeated in read " << readIndex << "\n";
 #endif
                 if (isFindRepeatReads)
                 {
@@ -382,11 +383,11 @@ buildContigs(
         //
         std::set<std::string> seenBefore;   // records k-mers already encountered during extension
 
-        while(! maxWords.empty())
+        while (! maxWords.empty())
         {
-    #ifdef DEBUG_ASBL
+#ifdef DEBUG_ASBL
             log_os << logtag << "Seeding kmer : " << maxWord << "\n";
-    #endif
+#endif
 
             maxWord=(*maxWords.begin());
             maxWords.erase(maxWords.begin());