Fix histogram calculation

kdm9 · Dec 7, 2015 · c0ff123 · c0ff123
1 parent a5fb86e
commit c0ff123
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/utils/entvec.cc b/src/utils/entvec.cc
@@ -116,14 +116,15 @@ sample_entvec_sum(khmer::CountingHash &sample)
             float bin_entropy = _bin_entropies[tab][bin];
             if (tab == 0) {
                 count_sum += counts[tab][bin];
+                histogram[counts[tab][bin]] += 1;
             }
             countentvec_sum += counts[tab][bin] * bin_entropy;
         }
         entvecsums.push_back(countentvec_sum);
     }
     for (const auto &pair: histogram) {
         double fraction = (double)pair.second / _tablesizes[0];
-        entropy +=  -(fraction * log2(fraction));
+        entropy -=  fraction * log2(fraction);
     }
     return std::make_tuple(count_sum, kwip::vec_min(entvecsums), entropy);
 }