Fixes total count bug when merging histograms with missing counts

bigmlcom · Jan 28, 2013 · 07d2907 · 07d2907
1 parent 80ac2fb
commit 07d2907
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -1,5 +1,5 @@
 
-(defproject histogram "2.1.0"
+(defproject histogram "2.1.1"
   :description "Dynamic/streaming histograms"
   :source-path "src/clj"
   :java-source-path "src/java"

diff --git a/src/java/com/bigml/histogram/Histogram.java b/src/java/com/bigml/histogram/Histogram.java
@@ -533,7 +533,6 @@ public Histogram merge(Histogram<T> histogram) throws MixedInsertException {
       _missingTarget.sum(histogram.getMissingTarget());
     }
     _missingCount += histogram.getMissingCount();
-    _totalCount += histogram.getMissingCount();
     return this;
   }
 

diff --git a/test/histogram/test/core.clj b/test/histogram/test/core.clj
@@ -58,7 +58,14 @@
         merged-hist (reduce merge! hists)]
     (is (about= (sum merged-hist 0)
                 (/ (* points hist-count) 2)
-                (/ (* points hist-count) 50)))))
+                (/ (* points hist-count) 50))))
+  (let [h1 (-> (create)
+               (insert! 1 1)
+               (insert! nil 1))
+        h2 (-> (create)
+               (insert! 2 2)
+               (insert! nil 2))]
+    (is (== 2 (total-count (merge! h1 h2))))))
 
 (deftest mixed-test
   (let [insert-pair #(apply insert! (apply insert! (create) %1) %2)