refactoring changes

vasia · vasia · commit 33f2f0278a8f · 2014-07-07T19:33:14.000+02:00
diff --git a/src/main/java/ml/grafos/okapi/clustering/kmeans/ArrayListOfDoubleArrayListWritableAggregator.java b/src/main/java/ml/grafos/okapi/clustering/kmeans/ArrayListOfDoubleArrayListWritableAggregator.java
@@ -1,6 +1,9 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import java.util.Random;
+
+import ml.grafos.okapi.common.data.ArrayListOfDoubleArrayListWritable;
+
 import org.apache.giraph.aggregators.Aggregator;
 import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable;
 
diff --git a/src/main/java/ml/grafos/okapi/clustering/kmeans/DoubleArrayListWritableAggregator.java b/src/main/java/ml/grafos/okapi/clustering/kmeans/DoubleArrayListWritableAggregator.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import ml.grafos.okapi.common.data.DoubleArrayListWritable;
 import org.apache.giraph.aggregators.BasicAggregator;
diff --git a/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansClustering.java b/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansClustering.java
@@ -1,6 +1,8 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import java.io.IOException;
+
+import ml.grafos.okapi.common.data.ArrayListOfDoubleArrayListWritable;
 import ml.grafos.okapi.common.data.DoubleArrayListWritable;
 
 import org.apache.giraph.aggregators.IntSumAggregator;
diff --git a/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansTextInputFormat.java b/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansTextInputFormat.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import java.io.IOException;
 import java.util.regex.Pattern;
diff --git a/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansTextOutputFormat.java b/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansTextOutputFormat.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import java.io.IOException;
 
diff --git a/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansVertexValue.java b/src/main/java/ml/grafos/okapi/clustering/kmeans/KMeansVertexValue.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/ml/grafos/okapi/common/data/ArrayListOfDoubleArrayListWritable.java b/src/main/java/ml/grafos/okapi/common/data/ArrayListOfDoubleArrayListWritable.java
@@ -1,6 +1,4 @@
-package ml.grafos.okapi.kmeans;
-
-import ml.grafos.okapi.common.data.DoubleArrayListWritable;
+package ml.grafos.okapi.common.data;
 
 import org.apache.giraph.utils.ArrayListWritable;
 
diff --git a/src/main/java/ml/grafos/okapi/common/graph/NullOutEdges.java b/src/main/java/ml/grafos/okapi/common/graph/NullOutEdges.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.common.graph;
 
 import java.io.DataInput;
 import java.io.DataOutput;
diff --git a/src/main/java/ml/grafos/okapi/kmeans/LongDoubleArrayListNullTextInputFormat.java b/src/main/java/ml/grafos/okapi/kmeans/LongDoubleArrayListNullTextInputFormat.java
diff --git a/src/test/java/ml/grafos/okapi/clustering/kmeans/TestDoubleArrayListWritableAggregator.java b/src/test/java/ml/grafos/okapi/clustering/kmeans/TestDoubleArrayListWritableAggregator.java
@@ -1,6 +1,7 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import static org.junit.Assert.*;
+import ml.grafos.okapi.clustering.kmeans.DoubleArrayListWritableAggregator;
 import ml.grafos.okapi.common.data.DoubleArrayListWritable;
 
 import org.apache.hadoop.io.DoubleWritable;
diff --git a/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKMeansClustering.java b/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKMeansClustering.java
@@ -1,8 +1,15 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import static org.junit.Assert.*;
 
 import java.util.Set;
+
+import ml.grafos.okapi.clustering.kmeans.ArrayListOfDoubleArrayListWritableAggregator;
+import ml.grafos.okapi.clustering.kmeans.KMeansClustering;
+import ml.grafos.okapi.clustering.kmeans.KMeansTextInputFormat;
+import ml.grafos.okapi.clustering.kmeans.KMeansTextOutputFormat;
+import ml.grafos.okapi.common.graph.NullOutEdges;
+
 import org.apache.giraph.conf.GiraphConfiguration;
 import org.apache.giraph.utils.InternalVertexRunner;
 import org.junit.Test;
diff --git a/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKMeansVertexValue.java b/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKMeansVertexValue.java
@@ -1,7 +1,7 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import static org.junit.Assert.*;
-
+import ml.grafos.okapi.clustering.kmeans.KMeansVertexValue;
 import ml.grafos.okapi.common.data.DoubleArrayListWritable;
 
 import org.apache.giraph.utils.WritableUtils;
diff --git a/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKmeansComputationMethods.java b/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKmeansComputationMethods.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKmeansMasterComputationMethods.java b/src/test/java/ml/grafos/okapi/clustering/kmeans/TestKmeansMasterComputationMethods.java
@@ -1,4 +1,4 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/ml/grafos/okapi/clustering/kmeans/TestRandomInitializationAggregator.java b/src/test/java/ml/grafos/okapi/clustering/kmeans/TestRandomInitializationAggregator.java
@@ -1,7 +1,8 @@
-package ml.grafos.okapi.kmeans;
+package ml.grafos.okapi.clustering.kmeans;
 
 import static org.junit.Assert.*;
-
+import ml.grafos.okapi.clustering.kmeans.ArrayListOfDoubleArrayListWritableAggregator;
+import ml.grafos.okapi.common.data.ArrayListOfDoubleArrayListWritable;
 import ml.grafos.okapi.common.data.DoubleArrayListWritable;
 
 import org.apache.giraph.conf.GiraphConfiguration;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ml.grafos.okapi.kmeans;`
	`1`	`+package ml.grafos.okapi.clustering.kmeans;`
`2`	`2`
`3`	`3`	`import ml.grafos.okapi.common.data.DoubleArrayListWritable;`
`4`	`4`	`import org.apache.giraph.aggregators.BasicAggregator;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package ml.grafos.okapi.kmeans;`
	`1`	`+package ml.grafos.okapi.common.graph;`
`2`	`2`
`3`	`3`	`import java.io.DataInput;`
`4`	`4`	`import java.io.DataOutput;`