Fix for incorrect weighted mean calculation

wssbck · Sep 14, 2014 · a550f10 · a550f10
1 parent d3568fe
commit a550f10
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/crossfilter-helpers.js b/crossfilter-helpers.js
@@ -110,13 +110,13 @@ var exports = (function(e){
 		return {
 			add : function(p, v){
 				p.count += w(v);
-				p.sum   += w(v) ? fn_f(v) : 0;
+				p.sum   += fn_f(v) * w(v);
 				p.mean   = p.count ? p.sum / p.count : 0;
 				return p;
 			},
 			remove : function(p, v){
 				p.count -= w(v);
-				p.sum   -= w(v) ? fn_f(v) : 0;
+				p.sum   -= fn_f(v) * w(v);
 				p.mean   = p.count ? p.sum / p.count : 0;
 				return p;
 			},

diff --git a/crossfilter-helpers.min.js b/crossfilter-helpers.min.js
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crossfilter-helpers",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "Apache-2.0",
   "description": "A set of reduction functions for use with crossfilter",
   "keywords": [

diff --git a/src/basic.js b/src/basic.js
@@ -110,13 +110,13 @@ var exports = (function(e){
 		return {
 			add : function(p, v){
 				p.count += w(v);
-				p.sum   += w(v) ? fn_f(v) : 0;
+				p.sum   += fn_f(v) * w(v);
 				p.mean   = p.count ? p.sum / p.count : 0;
 				return p;
 			},
 			remove : function(p, v){
 				p.count -= w(v);
-				p.sum   -= w(v) ? fn_f(v) : 0;
+				p.sum   -= fn_f(v) * w(v);
 				p.mean   = p.count ? p.sum / p.count : 0;
 				return p;
 			},