svn commit: r1365372 - in /giraph/trunk: ./ src/main/java/org/apache/giraph/aggregators/ src/test/java/org/apache/giraph/aggregators/

[aching]

Author: aching
Date: Wed Jul 25 00:50:56 2012
New Revision: 1365372

URL: http://svn.apache.org/viewvc?rev=1365372&view=rev
Log:
GIRAPH-266: Average aggregators don't calculate real average
(majakabiljo via aching).


Removed:
    
giraph/trunk/src/main/java/org/apache/giraph/aggregators/DoubleAverageAggregator.java
    
giraph/trunk/src/main/java/org/apache/giraph/aggregators/FloatAverageAggregator.java
Modified:
    giraph/trunk/CHANGELOG
    
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestDoubleAggregators.java
    
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestFloatAggregators.java

Modified: giraph/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1365372&r1=1365371&r2=1365372&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Wed Jul 25 00:50:56 2012
@@ -2,6 +2,9 @@ Giraph Change Log
 
 Release 0.2.0 - unreleased
 
+  GIRAPH-266: Average aggregators don't calculate real average
+  (majakabiljo via aching).
+
   GIRAPH-244: Vertex API redesign (apresta via aching).
 
   GIRAPH-236: Add FindBugs to maven build (Jan van der Lugt via

Modified: 
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestDoubleAggregators.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestDoubleAggregators.java?rev=1365372&r1=1365371&r2=1365372&view=diff
==============================================================================
--- 
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestDoubleAggregators.java
 (original)
+++ 
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestDoubleAggregators.java
 Wed Jul 25 00:50:56 2012
@@ -26,18 +26,6 @@ import org.junit.Test;
 public class TestDoubleAggregators {
 
   @Test
-  public void testAverageAggregator() {
-    DoubleAverageAggregator max = new DoubleAverageAggregator();
-    max.aggregate(1.0);
-    max.aggregate(new DoubleWritable(3.0));
-    assertEquals(2.0, max.getAggregatedValue().get());
-    max.resetAggregatedValue();
-    assertEquals(0.0, max.getAggregatedValue().get());
-    DoubleWritable dw = max.createAggregatedValue();
-    assertNotNull(dw);
-  }
-  
-  @Test
   public void testMaxAggregator() {
     DoubleMaxAggregator max = new DoubleMaxAggregator();
     max.aggregate(2.0);

Modified: 
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestFloatAggregators.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestFloatAggregators.java?rev=1365372&r1=1365371&r2=1365372&view=diff
==============================================================================
--- 
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestFloatAggregators.java
 (original)
+++ 
giraph/trunk/src/test/java/org/apache/giraph/aggregators/TestFloatAggregators.java
 Wed Jul 25 00:50:56 2012
@@ -26,18 +26,6 @@ import org.junit.Test;
 public class TestFloatAggregators {
 
   @Test
-  public void testAverageAggregator() {
-    FloatAverageAggregator max = new FloatAverageAggregator();
-    max.aggregate(1.0f);
-    max.aggregate(new FloatWritable(3.0f));
-    assertEquals(2.0f, max.getAggregatedValue().get());
-    max.resetAggregatedValue();
-    assertEquals(0.0f, max.getAggregatedValue().get());
-    FloatWritable fw = max.createAggregatedValue();
-    assertNotNull(fw);
-  }
-  
-  @Test
   public void testMaxAggregator() {
     FloatMaxAggregator max = new FloatMaxAggregator();
     max.aggregate(2.0f);