implemented new aggregate function on ZINTERSTORE:

cbd · Dec 22, 2011 · 2a00732 · 2a00732
1 parent 516e840
commit 2a00732
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/edis_db.erl b/src/edis_db.erl
@@ -1876,7 +1876,7 @@ weighted_intersection(Aggregate, [{ZSet, Weight} | Rest], AccWeight, AccZSet) ->
     Aggregate, Rest, 1.0,
     zsets:intersection(
       fun(Score, AccScore) ->
-              lists:Aggregate([Score * Weight, AccScore * AccWeight])
+              edis_util:Aggregate(edis_util:multiply(Score,Weight),edis_util:multiply(AccScore,AccWeight))
       end, ZSet, AccZSet)).
 
 weighted_union(_Aggregate, [{ZSet, Weight}]) ->
@@ -1890,13 +1890,10 @@ weighted_union(Aggregate, [{ZSet, Weight} | Rest], AccWeight, AccZSet) ->
     Aggregate, Rest, 1.0,
     zsets:union(
       fun(undefined, AccScore) ->
-%%               AccScore * AccWeight;
 				 			edis_util:multiply(AccScore,AccWeight);
          (Score, undefined) ->
-%%               Score * Weight;
 							edis_util:multiply(Score,Weight);
          (Score, AccScore) ->
-%%               lists:Aggregate([Score * Weight, AccScore * AccWeight])
 							edis_util:Aggregate(edis_util:multiply(Score,Weight),edis_util:multiply(AccScore,AccWeight))
       end, ZSet, AccZSet)).