Repository: mahout Updated Branches: refs/heads/master e87567af0 -> 02ff22f0b
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java b/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java index dbb950a..0fab2fe 100644 --- a/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java +++ b/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterOutputPostProcessorTest.java @@ -169,7 +169,7 @@ public final class ClusterOutputPostProcessorTest extends MahoutTestCase { Path clusteredPointsPath = new Path(bottomLevelCluster, "clusteredPoints"); DummyOutputCollector<IntWritable,WeightedVectorWritable> collector = - new DummyOutputCollector<IntWritable,WeightedVectorWritable>(); + new DummyOutputCollector<>(); // The key is the clusterId, the value is the weighted vector for (Pair<IntWritable,WeightedVectorWritable> record : http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/common/DummyOutputCollector.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/common/DummyOutputCollector.java b/mr/src/test/java/org/apache/mahout/common/DummyOutputCollector.java index 6951f5a..8f89623 100644 --- a/mr/src/test/java/org/apache/mahout/common/DummyOutputCollector.java +++ b/mr/src/test/java/org/apache/mahout/common/DummyOutputCollector.java @@ -30,7 +30,7 @@ import java.util.TreeMap; public final class DummyOutputCollector<K extends WritableComparable, V extends Writable> implements OutputCollector<K,V> { - private final Map<K, List<V>> data = new TreeMap<K,List<V>>(); + private final Map<K, List<V>> data = new TreeMap<>(); @Override public void collect(K key,V values) { http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/common/DummyRecordWriterTest.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/common/DummyRecordWriterTest.java b/mr/src/test/java/org/apache/mahout/common/DummyRecordWriterTest.java index 6b25448..1d53cc7 100644 --- a/mr/src/test/java/org/apache/mahout/common/DummyRecordWriterTest.java +++ b/mr/src/test/java/org/apache/mahout/common/DummyRecordWriterTest.java @@ -28,7 +28,7 @@ public class DummyRecordWriterTest { @Test public void testWrite() { DummyRecordWriter<IntWritable, VectorWritable> writer = - new DummyRecordWriter<IntWritable, VectorWritable>(); + new DummyRecordWriter<>(); IntWritable reusableIntWritable = new IntWritable(); VectorWritable reusableVectorWritable = new VectorWritable(); reusableIntWritable.set(0); http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/common/iterator/TestFixedSizeSampler.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/common/iterator/TestFixedSizeSampler.java b/mr/src/test/java/org/apache/mahout/common/iterator/TestFixedSizeSampler.java index 470e6d8..91e092f 100644 --- a/mr/src/test/java/org/apache/mahout/common/iterator/TestFixedSizeSampler.java +++ b/mr/src/test/java/org/apache/mahout/common/iterator/TestFixedSizeSampler.java @@ -23,7 +23,7 @@ public final class TestFixedSizeSampler extends SamplerCase { @Override protected Iterator<Integer> createSampler(int n, Iterator<Integer> source) { - return new FixedSizeSamplingIterator<Integer>(n, source); + return new FixedSizeSamplingIterator<>(n, source); } @Override http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java b/mr/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java index 970ea79..802eb86 100644 --- a/mr/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java +++ b/mr/src/test/java/org/apache/mahout/common/iterator/TestSamplingIterator.java @@ -26,13 +26,13 @@ public final class TestSamplingIterator extends MahoutTestCase { @Test public void testEmptyCase() { - assertFalse(new SamplingIterator<Integer>(new CountingIterator(0), 0.9999).hasNext()); - assertFalse(new SamplingIterator<Integer>(new CountingIterator(0), 1).hasNext()); + assertFalse(new SamplingIterator<>(new CountingIterator(0), 0.9999).hasNext()); + assertFalse(new SamplingIterator<>(new CountingIterator(0), 1).hasNext()); } @Test public void testSmallInput() { - Iterator<Integer> t = new SamplingIterator<Integer>(new CountingIterator(1), 0.9999); + Iterator<Integer> t = new SamplingIterator<>(new CountingIterator(1), 0.9999); assertTrue(t.hasNext()); assertEquals(0, t.next().intValue()); assertFalse(t.hasNext()); @@ -40,17 +40,17 @@ public final class TestSamplingIterator extends MahoutTestCase { @Test(expected = IllegalArgumentException.class) public void testBadRate1() { - new SamplingIterator<Integer>(new CountingIterator(1), 0.0); + new SamplingIterator<>(new CountingIterator(1), 0.0); } @Test(expected = IllegalArgumentException.class) public void testBadRate2() { - new SamplingIterator<Integer>(new CountingIterator(1), 1.1); + new SamplingIterator<>(new CountingIterator(1), 1.1); } @Test public void testExactSizeMatch() { - Iterator<Integer> t = new SamplingIterator<Integer>(new CountingIterator(10), 1); + Iterator<Integer> t = new SamplingIterator<>(new CountingIterator(10), 1); for (int i = 0; i < 10; i++) { assertTrue(t.hasNext()); assertEquals(i, t.next().intValue()); @@ -61,7 +61,7 @@ public final class TestSamplingIterator extends MahoutTestCase { @Test public void testSample() { for (int i = 0; i < 1000; i++) { - Iterator<Integer> t = new SamplingIterator<Integer>(new CountingIterator(1000), 0.1); + Iterator<Integer> t = new SamplingIterator<>(new CountingIterator(1000), 0.1); int k = 0; while (t.hasNext()) { int v = t.next(); http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/common/iterator/TestStableFixedSizeSampler.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/common/iterator/TestStableFixedSizeSampler.java b/mr/src/test/java/org/apache/mahout/common/iterator/TestStableFixedSizeSampler.java index 7ccd6a7..558899f 100644 --- a/mr/src/test/java/org/apache/mahout/common/iterator/TestStableFixedSizeSampler.java +++ b/mr/src/test/java/org/apache/mahout/common/iterator/TestStableFixedSizeSampler.java @@ -23,7 +23,7 @@ public final class TestStableFixedSizeSampler extends SamplerCase { @Override protected Iterator<Integer> createSampler(int n, Iterator<Integer> source) { - return new StableFixedSizeSamplingIterator<Integer>(n, source); + return new StableFixedSizeSamplingIterator<>(n, source); } @Override http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/ep/EvolutionaryProcessTest.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/ep/EvolutionaryProcessTest.java b/mr/src/test/java/org/apache/mahout/ep/EvolutionaryProcessTest.java index e53db7e..e7a3b3e 100644 --- a/mr/src/test/java/org/apache/mahout/ep/EvolutionaryProcessTest.java +++ b/mr/src/test/java/org/apache/mahout/ep/EvolutionaryProcessTest.java @@ -28,9 +28,9 @@ public final class EvolutionaryProcessTest extends MahoutTestCase { @Test public void testConverges() throws Exception { - State<Foo, Double> s0 = new State<Foo, Double>(new double[5], 1); + State<Foo, Double> s0 = new State<>(new double[5], 1); s0.setPayload(new Foo()); - EvolutionaryProcess<Foo, Double> ep = new EvolutionaryProcess<Foo, Double>(10, 100, s0); + EvolutionaryProcess<Foo, Double> ep = new EvolutionaryProcess<>(10, 100, s0); State<Foo, Double> best = null; for (int i = 0; i < 20; i++) { http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java b/mr/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java index bb2c373..a8a861c 100644 --- a/mr/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java +++ b/mr/src/test/java/org/apache/mahout/math/hadoop/similarity/TestVectorDistanceSimilarityJob.java @@ -213,7 +213,7 @@ public class TestVectorDistanceSimilarityJob extends MahoutTestCase { }; ToolRunner.run(getConfiguration(), new VectorDistanceSimilarityJob(), args); - DummyOutputCollector<Text, VectorWritable> collector = new DummyOutputCollector<Text, VectorWritable>(); + DummyOutputCollector<Text, VectorWritable> collector = new DummyOutputCollector<>(); for (Pair<Text, VectorWritable> record : new SequenceFileIterable<Text, VectorWritable>( new Path(output, "part-m-00000"), conf)) { http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/math/neighborhood/SearchQualityTest.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/math/neighborhood/SearchQualityTest.java b/mr/src/test/java/org/apache/mahout/math/neighborhood/SearchQualityTest.java index 4080d3b..c1c318c 100644 --- a/mr/src/test/java/org/apache/mahout/math/neighborhood/SearchQualityTest.java +++ b/mr/src/test/java/org/apache/mahout/math/neighborhood/SearchQualityTest.java @@ -156,7 +156,7 @@ public class SearchQualityTest { long start = System.currentTimeMillis(); List<List<WeightedThing<Vector>>> results = searcher.search(queries, NUM_RESULTS); long end = System.currentTimeMillis(); - return new Pair<List<List<WeightedThing<Vector>>>, Long>(results, end - start); + return new Pair<>(results, end - start); } public static Pair<List<WeightedThing<Vector>>, Long> getResultsAndRuntimeSearchFirst( @@ -164,7 +164,7 @@ public class SearchQualityTest { long start = System.currentTimeMillis(); List<WeightedThing<Vector>> results = searcher.searchFirst(queries, false); long end = System.currentTimeMillis(); - return new Pair<List<WeightedThing<Vector>>, Long>(results, end - start); + return new Pair<>(results, end - start); } static class StripWeight implements Function<WeightedThing<Vector>, Vector> { http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java b/mr/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java index 835854f..dc37232 100644 --- a/mr/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java +++ b/mr/src/test/java/org/apache/mahout/vectorizer/DictionaryVectorizerTest.java @@ -194,7 +194,7 @@ public final class DictionaryVectorizerTest extends MahoutTestCase { } }; - Map<String, Integer> dictionary = new HashMap<String, Integer>(); + Map<String, Integer> dictionary = new HashMap<>(); for (Pair<Text, IntWritable> value : new SequenceFileDirIterable<Text, IntWritable>( http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java ---------------------------------------------------------------------- diff --git a/mr/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java b/mr/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java index 18cb84e..91ef194 100644 --- a/mr/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java +++ b/mr/src/test/java/org/apache/mahout/vectorizer/EncodedVectorsFromSequenceFilesTest.java @@ -110,7 +110,7 @@ public class EncodedVectorsFromSequenceFilesTest extends MahoutTestCase { ToolRunner.run(getConfiguration(), new EncodedVectorsFromSequenceFiles(), args); - SequenceFileDirIterator<Text, VectorWritable> iter = new SequenceFileDirIterator<Text, VectorWritable>(outputPath, PathType.LIST, PathFilters.partFilter(), null, true, conf); + SequenceFileDirIterator<Text, VectorWritable> iter = new SequenceFileDirIterator<>(outputPath, PathType.LIST, PathFilters.partFilter(), null, true, conf); int seen = 0; while (iter.hasNext()) { Pair<Text, VectorWritable> next = iter.next();
