svn commit: r1371383 - in /mahout/trunk/core/src: main/java/org/apache/mahout/clustering/AbstractCluster.java main/java/org/apache/mahout/clustering/ClusterObservations.java test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java

[jeastman]

Author: jeastman
Date: Thu Aug  9 18:57:37 2012
New Revision: 1371383

URL: http://svn.apache.org/viewvc?rev=1371383&view=rev
Log:
Removed unused ClusterObservations and associated methods & test. All tests run

Removed:
    
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/ClusterObservations.java
Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
    
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java?rev=1371383&r1=1371382&r2=1371383&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/clustering/AbstractCluster.java
 Thu Aug  9 18:57:37 2012
@@ -219,20 +219,6 @@ public abstract class AbstractCluster im
     setS2(getS2().plus(cl.getS2()));
   }
   
-  public void observe(ClusterObservations observations) {
-    setS0(getS0() + observations.getS0());
-    if (getS1() == null) {
-      setS1(observations.getS1().clone());
-    } else {
-      getS1().assign(observations.getS1(), Functions.PLUS);
-    }
-    if (getS2() == null) {
-      setS2(observations.getS2().clone());
-    } else {
-      getS2().assign(observations.getS2(), Functions.PLUS);
-    }
-  }
-  
   @Override
   public void observe(VectorWritable x) {
     observe(x.get());
@@ -279,10 +265,6 @@ public abstract class AbstractCluster im
   }
   
   
-  public ClusterObservations getObservations() {
-    return new ClusterObservations(getS0(), getS1(), getS2());
-  }
-  
   @Override
   public void computeParameters() {
     if (getS0() == 0) {

Modified: 
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=1371383&r1=1371382&r2=1371383&view=diff
==============================================================================
--- 
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
 (original)
+++ 
mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
 Thu Aug  9 18:57:37 2012
@@ -22,12 +22,9 @@ import java.util.List;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.DataInputBuffer;
-import org.apache.hadoop.io.DataOutputBuffer;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.util.ToolRunner;
-import org.apache.mahout.clustering.ClusterObservations;
 import org.apache.mahout.clustering.ClusteringTestUtils;
 import org.apache.mahout.clustering.kmeans.TestKmeansClustering;
 import org.apache.mahout.common.HadoopUtil;
@@ -35,7 +32,6 @@ import org.apache.mahout.common.MahoutTe
 import org.apache.mahout.common.commandline.DefaultOptionCreator;
 import org.apache.mahout.common.distance.DistanceMeasure;
 import org.apache.mahout.common.distance.EuclideanDistanceMeasure;
-import org.apache.mahout.math.DenseVector;
 import org.apache.mahout.math.Vector;
 import org.apache.mahout.math.VectorWritable;
 import org.junit.Before;
@@ -203,20 +199,4 @@ public final class TestFuzzyKmeansCluste
 
   }
 
-  @Test
-  public void testClusterObservationsSerialization() throws Exception {
-    double[] data = { 1.1, 2.2, 3.3 };
-    Vector vector = new DenseVector(data);
-    ClusterObservations reference = new ClusterObservations(1, 2.0, vector, 
vector);
-    DataOutputBuffer out = new DataOutputBuffer();
-    reference.write(out);
-    ClusterObservations info = new ClusterObservations();
-    DataInputBuffer in = new DataInputBuffer();
-    in.reset(out.getData(), out.getLength());
-    info.readFields(in);
-    assertEquals("probability", reference.getS0(), info.getS0(), EPSILON);
-    assertEquals("point total", reference.getS1(), info.getS1());
-    assertEquals("combiner", reference.getCombinerState(), 
info.getCombinerState());
-  }
-
 }