You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sm...@apache.org on 2016/10/10 00:24:13 UTC
[1/2] mahout git commit: apply diamond operator where possible,
this closes apache/mahout#258
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();
[2/2] mahout git commit: apply diamond operator where possible,
this closes apache/mahout#258
Posted by sm...@apache.org.
apply diamond operator where possible, this closes apache/mahout#258
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/02ff22f0
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/02ff22f0
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/02ff22f0
Branch: refs/heads/master
Commit: 02ff22f0bbf35c3c25094433cf66261985b3ce4d
Parents: e87567a
Author: Karl Richter <krichter722>
Authored: Sun Oct 9 20:23:49 2016 -0400
Committer: smarthi <sm...@apache.org>
Committed: Sun Oct 9 20:23:49 2016 -0400
----------------------------------------------------------------------
.../sgd/AdaptiveLogisticModelParameters.java | 2 +-
.../classifier/sgd/RunAdaptiveLogistic.java | 2 +-
.../org/apache/mahout/h2obindings/ops/Ax.java | 2 +-
.../h2obindings/ops/TimesRightMatrix.java | 4 +--
.../WikipediaDatasetCreatorDriver.java | 2 +-
.../utils/clustering/GraphMLClusterWriter.java | 2 +-
.../mahout/utils/regex/RegexMapperTest.java | 2 +-
...itFeedbackAlternatingLeastSquaresSolver.java | 2 +-
.../math/decomposer/lanczos/LanczosSolver.java | 4 +--
.../mahout/math/list/ObjectArrayList.java | 6 ++--
.../org/apache/mahout/math/map/OpenHashMap.java | 6 ++--
.../apache/mahout/math/random/IndianBuffet.java | 4 +--
.../mahout/math/random/PoissonSampler.java | 6 ++--
.../org/apache/mahout/math/set/OpenHashSet.java | 6 ++--
.../java/org/apache/mahout/math/VectorTest.java | 2 +-
.../als/AlternatingLeastSquaresSolverTest.java | 2 +-
.../mahout/math/list/ObjectArrayListTest.java | 6 ++--
.../mahout/math/random/MultinomialTest.java | 20 ++++++-------
.../mahout/math/randomized/RandomBlasting.java | 14 ++++-----
.../mahout/cf/taste/impl/common/Cache.java | 2 +-
.../cf/taste/impl/recommender/NullRescorer.java | 2 +-
.../mahout/classifier/df/split/OptIgSplit.java | 2 +-
.../classifier/df/tools/TreeVisualizer.java | 2 +-
.../naivebayes/training/TrainNaiveBayesJob.java | 2 +-
.../classify/ClusterClassificationDriver.java | 2 +-
.../classify/ClusterClassificationMapper.java | 2 +-
.../postprocessor/ClusterCountReader.java | 2 +-
.../org/apache/mahout/common/AbstractJob.java | 2 +-
.../org/apache/mahout/common/HadoopUtil.java | 4 +--
.../common/iterator/SamplingIterable.java | 4 +--
.../taste/hadoop/item/RecommenderJobTest.java | 14 ++++-----
.../mahout/cf/taste/impl/TasteTestCase.java | 4 +--
.../mahout/cf/taste/impl/common/CacheTest.java | 4 +--
.../cf/taste/impl/common/FastByIDMapTest.java | 16 +++++------
.../cf/taste/impl/common/FastMapTest.java | 20 ++++++-------
...lusAnonymousConcurrentUserDataModelTest.java | 10 +++----
.../SamplingCandidateItemsStrategyTest.java | 2 +-
.../recommender/svd/ALSWRFactorizerTest.java | 2 +-
.../svd/FilePersistenceStrategyTest.java | 4 +--
.../svd/ParallelSGDFactorizerTest.java | 6 ++--
.../training/IndexInstancesMapperTest.java | 2 +-
.../clustering/canopy/TestCanopyCreation.java | 30 ++++++++++----------
.../clustering/kmeans/TestKmeansClustering.java | 10 +++----
.../spectral/TestAffinityMatrixInputJob.java | 6 ++--
.../spectral/TestMatrixDiagonalizeJob.java | 6 ++--
.../spectral/TestUnitVectorizerJob.java | 2 +-
.../clustering/spectral/TestVectorCache.java | 2 +-
.../TestVectorMatrixMultiplicationJob.java | 2 +-
.../spectral/kmeans/TestEigenSeedGenerator.java | 2 +-
.../clustering/streaming/cluster/DataUtils.java | 2 +-
.../mapreduce/StreamingKMeansTestMR.java | 5 ++--
.../postprocessor/ClusterCountReaderTest.java | 2 +-
.../ClusterOutputPostProcessorTest.java | 2 +-
.../mahout/common/DummyOutputCollector.java | 2 +-
.../mahout/common/DummyRecordWriterTest.java | 2 +-
.../common/iterator/TestFixedSizeSampler.java | 2 +-
.../common/iterator/TestSamplingIterator.java | 14 ++++-----
.../iterator/TestStableFixedSizeSampler.java | 2 +-
.../mahout/ep/EvolutionaryProcessTest.java | 4 +--
.../TestVectorDistanceSimilarityJob.java | 2 +-
.../math/neighborhood/SearchQualityTest.java | 4 +--
.../vectorizer/DictionaryVectorizerTest.java | 2 +-
.../EncodedVectorsFromSequenceFilesTest.java | 2 +-
63 files changed, 155 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java b/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java
index 7d94f94..b2ce8b1 100644
--- a/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java
+++ b/examples/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticModelParameters.java
@@ -143,7 +143,7 @@ public class AdaptiveLogisticModelParameters extends LogisticModelParameters {
public void readFields(DataInput in) throws IOException {
setTargetVariable(in.readUTF());
int typeMapSize = in.readInt();
- Map<String, String> typeMap = new HashMap<String, String>(typeMapSize);
+ Map<String, String> typeMap = new HashMap<>(typeMapSize);
for (int i = 0; i < typeMapSize; i++) {
String key = in.readUTF();
String value = in.readUTF();
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java b/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
index 634bf38..678a8f5 100644
--- a/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
+++ b/examples/src/main/java/org/apache/mahout/classifier/sgd/RunAdaptiveLogistic.java
@@ -85,7 +85,7 @@ public final class RunAdaptiveLogistic {
String line = in.readLine();
csv.firstLine(line);
line = in.readLine();
- Map<String, Double> results = new HashMap<String, Double>();
+ Map<String, Double> results = new HashMap<>();
while (line != null) {
Vector v = new SequentialAccessSparseVector(lmp.getNumFeatures());
csv.processLine(line, v, false);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
index f732460..5269709 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
@@ -41,7 +41,7 @@ public class Ax {
public static H2ODrm exec(H2ODrm drmA, Vector x) {
Frame A = drmA.frame;
Vec keys = drmA.keys;
- final H2OBCast<Vector> bx = new H2OBCast<Vector>(x);
+ final H2OBCast<Vector> bx = new H2OBCast<>(x);
// Ax is written into nc (single element, not array) with an MRTask on A,
// and therefore will be similarly partitioned as A.
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java
index e7b74a8..aefb514 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java
@@ -60,7 +60,7 @@ public class TimesRightMatrix {
* A.numCols() == d.size()
*/
private static Frame execDiagonal(final Frame A, Vector d) {
- final H2OBCast<Vector> bd = new H2OBCast<Vector>(d);
+ final H2OBCast<Vector> bd = new H2OBCast<>(d);
return new MRTask() {
public void map(Chunk chks[], NewChunk ncs[]) {
@@ -83,7 +83,7 @@ public class TimesRightMatrix {
* A.numCols() == b.rowSize()
*/
private static Frame execCommon(final Frame A, Matrix b) {
- final H2OBCast<Matrix> bb = new H2OBCast<Matrix>(b);
+ final H2OBCast<Matrix> bb = new H2OBCast<>(b);
return new MRTask() {
public void map(Chunk chks[], NewChunk ncs[]) {
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorDriver.java
----------------------------------------------------------------------
diff --git a/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorDriver.java b/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorDriver.java
index 7113629..8214407 100644
--- a/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorDriver.java
+++ b/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaDatasetCreatorDriver.java
@@ -160,7 +160,7 @@ public final class WikipediaDatasetCreatorDriver {
}
Stringifier<Set<String>> setStringifier =
- new DefaultStringifier<Set<String>>(conf, GenericsUtil.getClass(categories));
+ new DefaultStringifier<>(conf, GenericsUtil.getClass(categories));
String categoriesStr = setStringifier.toString(categories);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
----------------------------------------------------------------------
diff --git a/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java b/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
index e5c4ae3..25e8f3b 100644
--- a/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
+++ b/integration/src/main/java/org/apache/mahout/utils/clustering/GraphMLClusterWriter.java
@@ -41,7 +41,7 @@ import org.apache.mahout.math.Vector;
public class GraphMLClusterWriter extends AbstractClusterWriter {
private static final Pattern VEC_PATTERN = Pattern.compile("\\{|\\:|\\,|\\}");
- private final Map<Integer, Color> colors = new HashMap<Integer, Color>();
+ private final Map<Integer, Color> colors = new HashMap<>();
private Color lastClusterColor;
private float lastX;
private float lastY;
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java
----------------------------------------------------------------------
diff --git a/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java b/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java
index d569acf..8ab643b 100644
--- a/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java
+++ b/integration/src/test/java/org/apache/mahout/utils/regex/RegexMapperTest.java
@@ -35,7 +35,7 @@ public final class RegexMapperTest extends MahoutTestCase {
Configuration conf = getConfiguration();
conf.set(RegexMapper.REGEX, "(?<=(\\?|&)q=).*?(?=&|$)");
conf.set(RegexMapper.TRANSFORMER_CLASS, URLDecodeTransformer.class.getName());
- DummyRecordWriter<LongWritable, Text> mapWriter = new DummyRecordWriter<LongWritable, Text>();
+ DummyRecordWriter<LongWritable, Text> mapWriter = new DummyRecordWriter<>();
Mapper<LongWritable, Text, LongWritable, Text>.Context mapContext = DummyRecordWriter
.build(mapper, conf, mapWriter);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/als/ImplicitFeedbackAlternatingLeastSquaresSolver.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/als/ImplicitFeedbackAlternatingLeastSquaresSolver.java b/math/src/main/java/org/apache/mahout/math/als/ImplicitFeedbackAlternatingLeastSquaresSolver.java
index e9bf378..28bf4b4 100644
--- a/math/src/main/java/org/apache/mahout/math/als/ImplicitFeedbackAlternatingLeastSquaresSolver.java
+++ b/math/src/main/java/org/apache/mahout/math/als/ImplicitFeedbackAlternatingLeastSquaresSolver.java
@@ -124,7 +124,7 @@ public class ImplicitFeedbackAlternatingLeastSquaresSolver {
Preconditions.checkArgument(userRatings.isSequentialAccess(), "need sequential access to ratings!");
/* (Cu -I) Y */
- OpenIntObjectHashMap<Vector> CuMinusIY = new OpenIntObjectHashMap<Vector>(userRatings.getNumNondefaultElements());
+ OpenIntObjectHashMap<Vector> CuMinusIY = new OpenIntObjectHashMap<>(userRatings.getNumNondefaultElements());
for (Element e : userRatings.nonZeroes()) {
CuMinusIY.put(e.index(), Y.get(e.index()).times(confidence(e.get()) - 1));
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java b/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
index c9e09eb..af72a90 100644
--- a/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
+++ b/math/src/main/java/org/apache/mahout/math/decomposer/lanczos/LanczosSolver.java
@@ -74,8 +74,8 @@ public class LanczosSolver {
ITERATE, ORTHOGANLIZE, TRIDIAG_DECOMP, FINAL_EIGEN_CREATE
}
- private final Map<TimingSection, Long> startTimes = new EnumMap<TimingSection, Long>(TimingSection.class);
- private final Map<TimingSection, Long> times = new EnumMap<TimingSection, Long>(TimingSection.class);
+ private final Map<TimingSection, Long> startTimes = new EnumMap<>(TimingSection.class);
+ private final Map<TimingSection, Long> times = new EnumMap<>(TimingSection.class);
private static final class Scale extends DoubleFunction {
private final double d;
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java b/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
index 9f50fe9..df3df8b 100644
--- a/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
+++ b/math/src/main/java/org/apache/mahout/math/list/ObjectArrayList.java
@@ -119,7 +119,7 @@ public class ObjectArrayList<T> extends AbstractObjectList<T> {
@Override
public Object clone() {
// overridden for performance only.
- return new ObjectArrayList<T>((T[]) elements.clone());
+ return new ObjectArrayList<>((T[]) elements.clone());
}
/**
@@ -325,14 +325,14 @@ public class ObjectArrayList<T> extends AbstractObjectList<T> {
@SuppressWarnings("unchecked")
public AbstractObjectList<T> partFromTo(int from, int to) {
if (size == 0) {
- return new ObjectArrayList<T>(0);
+ return new ObjectArrayList<>(0);
}
checkRangeFromTo(from, to, size);
Object[] part = new Object[to - from + 1];
System.arraycopy(elements, from, part, 0, to - from + 1);
- return new ObjectArrayList<T>((T[]) part);
+ return new ObjectArrayList<>((T[]) part);
}
/** Reverses the elements of the receiver. Last becomes first, second last becomes second first, and so on. */
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java b/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
index 1ea2ec6..0efca4b 100644
--- a/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
+++ b/math/src/main/java/org/apache/mahout/math/map/OpenHashMap.java
@@ -553,7 +553,7 @@ public class OpenHashMap<K,V> extends AbstractSet implements Map<K,V> {
*/
@Override
public Set<java.util.Map.Entry<K,V>> entrySet() {
- final Set<Entry<K, V>> entries = new OpenHashSet<Map.Entry<K,V>>();
+ final Set<Entry<K, V>> entries = new OpenHashSet<>();
forEachPair(new ObjectObjectProcedure<K,V>() {
@Override
public boolean apply(K key, V value) {
@@ -570,7 +570,7 @@ public class OpenHashMap<K,V> extends AbstractSet implements Map<K,V> {
*/
@Override
public Set<K> keySet() {
- final Set<K> keys = new OpenHashSet<K>();
+ final Set<K> keys = new OpenHashSet<>();
forEachKey(new ObjectProcedure<K>() {
@Override
public boolean apply(K element) {
@@ -594,7 +594,7 @@ public class OpenHashMap<K,V> extends AbstractSet implements Map<K,V> {
*/
@Override
public Collection<V> values() {
- final List<V> valueList = new ArrayList<V>();
+ final List<V> valueList = new ArrayList<>();
forEachPair(new ObjectObjectProcedure<K,V>() {
@Override
public boolean apply(K key, V value) {
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/random/IndianBuffet.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/random/IndianBuffet.java b/math/src/main/java/org/apache/mahout/math/random/IndianBuffet.java
index a0598c4..27b5d84 100644
--- a/math/src/main/java/org/apache/mahout/math/random/IndianBuffet.java
+++ b/math/src/main/java/org/apache/mahout/math/random/IndianBuffet.java
@@ -49,11 +49,11 @@ public final class IndianBuffet<T> implements Sampler<List<T>> {
}
public static IndianBuffet<Integer> createIntegerDocumentSampler(double alpha) {
- return new IndianBuffet<Integer>(alpha, new IdentityConverter());
+ return new IndianBuffet<>(alpha, new IdentityConverter());
}
public static IndianBuffet<String> createTextDocumentSampler(double alpha) {
- return new IndianBuffet<String>(alpha, new WordConverter());
+ return new IndianBuffet<>(alpha, new WordConverter());
}
@Override
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/random/PoissonSampler.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/random/PoissonSampler.java b/math/src/main/java/org/apache/mahout/math/random/PoissonSampler.java
index e317492..e4e49f8 100644
--- a/math/src/main/java/org/apache/mahout/math/random/PoissonSampler.java
+++ b/math/src/main/java/org/apache/mahout/math/random/PoissonSampler.java
@@ -56,11 +56,11 @@ public final class PoissonSampler extends AbstractSamplerFunction {
while (u / 20 < limit) {
double pdf = pd.probability(i);
limit -= pdf;
- steps.add(new WeightedThing<Integer>(i, pdf));
+ steps.add(new WeightedThing<>(i, pdf));
i++;
}
- steps.add(new WeightedThing<Integer>(steps.size(), limit));
- partial = new Multinomial<Integer>(steps);
+ steps.add(new WeightedThing<>(steps.size(), limit));
+ partial = new Multinomial<>(steps);
}
return partial.sample(u);
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java b/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java
index 892a17d..285b5a5 100644
--- a/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java
+++ b/math/src/main/java/org/apache/mahout/math/set/OpenHashSet.java
@@ -475,14 +475,14 @@ public class OpenHashSet<T> extends AbstractSet implements Set<T> {
*/
@Override
public Iterator<T> iterator() {
- List<T> keyList = new ArrayList<T>();
+ List<T> keyList = new ArrayList<>();
keys(keyList);
return keyList.iterator();
}
@Override
public Object[] toArray() {
- List<T> keyList = new ArrayList<T>();
+ List<T> keyList = new ArrayList<>();
keys(keyList);
return keyList.toArray();
}
@@ -541,7 +541,7 @@ public class OpenHashSet<T> extends AbstractSet implements Set<T> {
}
public List<T> keys() {
- List<T> keys = new ArrayList<T>();
+ List<T> keys = new ArrayList<>();
keys(keys);
return keys;
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/test/java/org/apache/mahout/math/VectorTest.java
----------------------------------------------------------------------
diff --git a/math/src/test/java/org/apache/mahout/math/VectorTest.java b/math/src/test/java/org/apache/mahout/math/VectorTest.java
index d355499..7f5f66e 100644
--- a/math/src/test/java/org/apache/mahout/math/VectorTest.java
+++ b/math/src/test/java/org/apache/mahout/math/VectorTest.java
@@ -920,7 +920,7 @@ public final class VectorTest extends MahoutTestCase {
Iterator<Element> it = vector.nonZeroes().iterator();
Element element = null;
int i = 0;
- HashSet<Integer> indexes = new HashSet<Integer>();
+ HashSet<Integer> indexes = new HashSet<>();
while (it.hasNext()) { // hasNext is called more often than next
if (i % 2 == 0) {
element = it.next();
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/test/java/org/apache/mahout/math/als/AlternatingLeastSquaresSolverTest.java
----------------------------------------------------------------------
diff --git a/math/src/test/java/org/apache/mahout/math/als/AlternatingLeastSquaresSolverTest.java b/math/src/test/java/org/apache/mahout/math/als/AlternatingLeastSquaresSolverTest.java
index 37ca33f..95b19ad 100644
--- a/math/src/test/java/org/apache/mahout/math/als/AlternatingLeastSquaresSolverTest.java
+++ b/math/src/test/java/org/apache/mahout/math/als/AlternatingLeastSquaresSolverTest.java
@@ -84,7 +84,7 @@ public class AlternatingLeastSquaresSolverTest extends MahoutTestCase {
}
private OpenIntObjectHashMap<Vector> asRowVectors(Matrix matrix) {
- OpenIntObjectHashMap<Vector> rows = new OpenIntObjectHashMap<Vector>();
+ OpenIntObjectHashMap<Vector> rows = new OpenIntObjectHashMap<>();
for (int row = 0; row < matrix.numRows(); row++) {
rows.put(row, matrix.viewRow(row).clone());
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java
----------------------------------------------------------------------
diff --git a/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java b/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java
index 4197143..5709c6e 100644
--- a/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java
+++ b/math/src/test/java/org/apache/mahout/math/list/ObjectArrayListTest.java
@@ -25,7 +25,7 @@ public class ObjectArrayListTest extends MahoutTestCase {
@Test
public void emptyOnCreation() {
- ObjectArrayList<String> list = new ObjectArrayList<String>();
+ ObjectArrayList<String> list = new ObjectArrayList<>();
assertTrue(list.isEmpty());
assertEquals(0, list.size());
list.add("1");
@@ -36,14 +36,14 @@ public class ObjectArrayListTest extends MahoutTestCase {
@Test
public void correctSizeAfterInstantiation() {
- ObjectArrayList<String> list = new ObjectArrayList<String>(100);
+ ObjectArrayList<String> list = new ObjectArrayList<>(100);
assertTrue(list.isEmpty());
assertEquals(0, list.size());
}
@Test
public void correctSizeAfterInstantiationWithElements() {
- ObjectArrayList<String> list = new ObjectArrayList<String>(new String[] { "1", "2", "3" });
+ ObjectArrayList<String> list = new ObjectArrayList<>(new String[] { "1", "2", "3" });
assertFalse(list.isEmpty());
assertEquals(3, list.size());
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/test/java/org/apache/mahout/math/random/MultinomialTest.java
----------------------------------------------------------------------
diff --git a/math/src/test/java/org/apache/mahout/math/random/MultinomialTest.java b/math/src/test/java/org/apache/mahout/math/random/MultinomialTest.java
index 44dbcbb..fe4543f 100644
--- a/math/src/test/java/org/apache/mahout/math/random/MultinomialTest.java
+++ b/math/src/test/java/org/apache/mahout/math/random/MultinomialTest.java
@@ -40,14 +40,14 @@ public class MultinomialTest extends MahoutTestCase {
@Test(expected = IllegalArgumentException.class)
public void testNoValues() {
Multiset<String> emptySet = HashMultiset.create();
- new Multinomial<String>(emptySet);
+ new Multinomial<>(emptySet);
}
@Test
public void testSingleton() {
Multiset<String> oneThing = HashMultiset.create();
oneThing.add("one");
- Multinomial<String> s = new Multinomial<String>(oneThing);
+ Multinomial<String> s = new Multinomial<>(oneThing);
assertEquals("one", s.sample(0));
assertEquals("one", s.sample(0.1));
assertEquals("one", s.sample(1));
@@ -59,7 +59,7 @@ public class MultinomialTest extends MahoutTestCase {
for (int i = 0; i < 5; i++) {
stuff.add(String.valueOf(i));
}
- Multinomial<String> s = new Multinomial<String>(stuff);
+ Multinomial<String> s = new Multinomial<>(stuff);
double EPSILON = 1.0e-15;
Multiset<String> cnt = HashMultiset.create();
@@ -103,9 +103,9 @@ public class MultinomialTest extends MahoutTestCase {
stuff.add(x);
}
- Multinomial<String> s0 = new Multinomial<String>(stuff);
- Multinomial<String> s1 = new Multinomial<String>(stuff);
- Multinomial<String> s2 = new Multinomial<String>(stuff);
+ Multinomial<String> s0 = new Multinomial<>(stuff);
+ Multinomial<String> s1 = new Multinomial<>(stuff);
+ Multinomial<String> s2 = new Multinomial<>(stuff);
double EPSILON = 1.0e-15;
Multiset<String> cnt = HashMultiset.create();
@@ -150,7 +150,7 @@ public class MultinomialTest extends MahoutTestCase {
@Test
public void testInsert() {
Random rand = RandomUtils.getRandom();
- Multinomial<Integer> table = new Multinomial<Integer>();
+ Multinomial<Integer> table = new Multinomial<>();
double[] p = new double[10];
for (int i = 0; i < 10; i++) {
@@ -167,7 +167,7 @@ public class MultinomialTest extends MahoutTestCase {
@Test
public void testSetZeroWhileIterating() {
- Multinomial<Integer> table = new Multinomial<Integer>();
+ Multinomial<Integer> table = new Multinomial<>();
for (int i = 0; i < 10000; ++i) {
table.add(i, i);
}
@@ -181,7 +181,7 @@ public class MultinomialTest extends MahoutTestCase {
@Test(expected=NullPointerException.class)
public void testNoNullValuesAllowed() {
- Multinomial<Integer> table = new Multinomial<Integer>();
+ Multinomial<Integer> table = new Multinomial<>();
// No null values should be allowed.
table.add(null, 1);
}
@@ -189,7 +189,7 @@ public class MultinomialTest extends MahoutTestCase {
@Test
public void testDeleteAndUpdate() {
Random rand = RandomUtils.getRandom();
- Multinomial<Integer> table = new Multinomial<Integer>();
+ Multinomial<Integer> table = new Multinomial<>();
assertEquals(0, table.getWeight(), 1.0e-9);
double total = 0;
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
----------------------------------------------------------------------
diff --git a/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java b/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
index 809325c..120b25f 100644
--- a/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
+++ b/math/src/test/java/org/apache/mahout/math/randomized/RandomBlasting.java
@@ -50,8 +50,8 @@ public class RandomBlasting extends RandomizedTest {
@Test
@Repeat(iterations = 20)
public void testAgainstReferenceOpenObjectIntHashMap() {
- OpenObjectIntHashMap<Integer> base = new OpenObjectIntHashMap<Integer>();
- Map<Integer, Integer> reference = new HashMap<Integer, Integer>();
+ OpenObjectIntHashMap<Integer> base = new OpenObjectIntHashMap<>();
+ Map<Integer, Integer> reference = new HashMap<>();
List<Operation> ops = Lists.newArrayList();
addOp(ops, Operation.ADD, 60);
@@ -101,8 +101,8 @@ public class RandomBlasting extends RandomizedTest {
@Test
@Repeat(iterations = 20)
public void testAgainstReferenceOpenIntObjectHashMap() {
- OpenIntObjectHashMap<Integer> base = new OpenIntObjectHashMap<Integer>();
- Map<Integer, Integer> reference = new HashMap<Integer, Integer>();
+ OpenIntObjectHashMap<Integer> base = new OpenIntObjectHashMap<>();
+ Map<Integer, Integer> reference = new HashMap<>();
List<Operation> ops = Lists.newArrayList();
addOp(ops, Operation.ADD, 60);
@@ -153,7 +153,7 @@ public class RandomBlasting extends RandomizedTest {
@Repeat(iterations = 20)
public void testAgainstReferenceOpenIntIntHashMap() {
OpenIntIntHashMap base = new OpenIntIntHashMap();
- HashMap<Integer, Integer> reference = new HashMap<Integer, Integer>();
+ HashMap<Integer, Integer> reference = new HashMap<>();
List<Operation> ops = Lists.newArrayList();
addOp(ops, Operation.ADD, 60);
@@ -269,7 +269,7 @@ public class RandomBlasting extends RandomizedTest {
@Test
@Repeat(iterations = 20)
public void testAgainstReferenceOpenHashSet() {
- Set<Integer> base = new OpenHashSet<Integer>();
+ Set<Integer> base = new OpenHashSet<>();
Set<Integer> reference = Sets.newHashSet();
List<Operation> ops = Lists.newArrayList();
@@ -334,7 +334,7 @@ public class RandomBlasting extends RandomizedTest {
/** */
@Test
public void testClearTable() throws Exception {
- OpenObjectIntHashMap<Integer> m = new OpenObjectIntHashMap<Integer>();
+ OpenObjectIntHashMap<Integer> m = new OpenObjectIntHashMap<>();
m.clear(); // rehash from the default capacity to the next prime after 1 (3).
m.put(1, 2);
m.clear(); // Should clear internal references.
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java b/mr/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
index 9f2a30b..b2d9b36 100755
--- a/mr/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
+++ b/mr/src/main/java/org/apache/mahout/cf/taste/impl/common/Cache.java
@@ -70,7 +70,7 @@ public final class Cache<K,V> implements Retriever<K,V> {
public Cache(Retriever<? super K,? extends V> retriever, int maxEntries) {
Preconditions.checkArgument(retriever != null, "retriever is null");
Preconditions.checkArgument(maxEntries >= 1, "maxEntries must be at least 1");
- cache = new FastMap<K, V>(11, maxEntries);
+ cache = new FastMap<>(11, maxEntries);
this.retriever = retriever;
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java b/mr/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
index 14e9ec6..e0eda7a 100644
--- a/mr/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
+++ b/mr/src/main/java/org/apache/mahout/cf/taste/impl/recommender/NullRescorer.java
@@ -28,7 +28,7 @@ import org.apache.mahout.common.LongPair;
*/
public final class NullRescorer<T> implements Rescorer<T>, IDRescorer {
- private static final IDRescorer USER_OR_ITEM_INSTANCE = new NullRescorer<Long>();
+ private static final IDRescorer USER_OR_ITEM_INSTANCE = new NullRescorer<>();
private static final Rescorer<LongPair> ITEM_ITEM_PAIR_INSTANCE = new NullRescorer<>();
private static final Rescorer<LongPair> USER_USER_PAIR_INSTANCE = new NullRescorer<>();
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java b/mr/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
index e3ab95f..56b1a04 100644
--- a/mr/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
+++ b/mr/src/main/java/org/apache/mahout/classifier/df/split/OptIgSplit.java
@@ -194,7 +194,7 @@ public class OptIgSplit extends IgSplit {
// There is no great reason to believe that categorical value order matters,
// but the original code worked this way, and it's not terrible in the absence
// of more sophisticated analysis
- Collection<Double> uniqueOrderedCategories = new TreeSet<Double>();
+ Collection<Double> uniqueOrderedCategories = new TreeSet<>();
for (double v : values) {
uniqueOrderedCategories.add(v);
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java b/mr/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
index 07928ab..a2a3458 100644
--- a/mr/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
+++ b/mr/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
@@ -106,7 +106,7 @@ public final class TreeVisualizer {
}
private static Map<String,Field> getReflectMap() {
- Map<String,Field> fields = new HashMap<String,Field>();
+ Map<String,Field> fields = new HashMap<>();
try {
Field m = CategoricalNode.class.getDeclaredField("attr");
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java b/mr/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
index 5373436..cd18d28 100644
--- a/mr/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
+++ b/mr/src/main/java/org/apache/mahout/classifier/naivebayes/training/TrainNaiveBayesJob.java
@@ -167,7 +167,7 @@ public final class TrainNaiveBayesJob extends AbstractJob {
private long createLabelIndex(Path labPath) throws IOException {
long labelSize = 0;
Iterable<Pair<Text,IntWritable>> iterable =
- new SequenceFileDirIterable<Text, IntWritable>(getInputPath(),
+ new SequenceFileDirIterable<>(getInputPath(),
PathType.LIST,
PathFilters.logsCRCFilter(),
getConf());
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java b/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java
index 384e294..ead95cf 100644
--- a/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java
+++ b/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationDriver.java
@@ -161,7 +161,7 @@ public final class ClusterClassificationDriver extends AbstractJob {
private static List<Cluster> populateClusterModels(Path clusterOutputPath, Configuration conf) throws IOException {
List<Cluster> clusterModels = new ArrayList<>();
Path finalClustersPath = finalClustersPath(conf, clusterOutputPath);
- Iterator<?> it = new SequenceFileDirValueIterator<Writable>(finalClustersPath, PathType.LIST,
+ Iterator<?> it = new SequenceFileDirValueIterator<>(finalClustersPath, PathType.LIST,
PathFilters.partFilter(), null, false, conf);
while (it.hasNext()) {
ClusterWritable next = (ClusterWritable) it.next();
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java b/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
index dfddab0..fffa7f9 100644
--- a/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
+++ b/mr/src/main/java/org/apache/mahout/clustering/classify/ClusterClassificationMapper.java
@@ -137,7 +137,7 @@ public class ClusterClassificationMapper extends
List<Cluster> clusters = new ArrayList<>();
FileSystem fileSystem = clusterOutputPath.getFileSystem(conf);
FileStatus[] clusterFiles = fileSystem.listStatus(clusterOutputPath, PathFilters.finalPartFilter());
- Iterator<?> it = new SequenceFileDirValueIterator<Writable>(
+ Iterator<?> it = new SequenceFileDirValueIterator<>(
clusterFiles[0].getPath(), PathType.LIST, PathFilters.partFilter(),
null, false, conf);
while (it.hasNext()) {
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReader.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReader.java b/mr/src/main/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReader.java
index 083b543..d0563fd 100644
--- a/mr/src/main/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReader.java
+++ b/mr/src/main/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReader.java
@@ -51,7 +51,7 @@ public final class ClusterCountReader {
FileSystem fileSystem = clusterOutputPath.getFileSystem(conf);
FileStatus[] clusterFiles = fileSystem.listStatus(clusterOutputPath, PathFilters.finalPartFilter());
int numberOfClusters = 0;
- Iterator<?> it = new SequenceFileDirValueIterator<Writable>(clusterFiles[0].getPath(),
+ Iterator<?> it = new SequenceFileDirValueIterator<>(clusterFiles[0].getPath(),
PathType.LIST,
PathFilters.partFilter(),
null,
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/common/AbstractJob.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/common/AbstractJob.java b/mr/src/main/java/org/apache/mahout/common/AbstractJob.java
index b732078..8072466 100644
--- a/mr/src/main/java/org/apache/mahout/common/AbstractJob.java
+++ b/mr/src/main/java/org/apache/mahout/common/AbstractJob.java
@@ -366,7 +366,7 @@ public abstract class AbstractJob extends Configured implements Tool {
return null;
}
- argMap = new TreeMap<String, List<String>>();
+ argMap = new TreeMap<>();
maybePut(argMap, cmdLine, this.options.toArray(new Option[this.options.size()]));
this.tempPath = new Path(getOption("tempDir"));
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/common/HadoopUtil.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/common/HadoopUtil.java b/mr/src/main/java/org/apache/mahout/common/HadoopUtil.java
index 27e5686..34515aa 100644
--- a/mr/src/main/java/org/apache/mahout/common/HadoopUtil.java
+++ b/mr/src/main/java/org/apache/mahout/common/HadoopUtil.java
@@ -201,7 +201,7 @@ public final class HadoopUtil {
public static long countRecords(Path path, Configuration conf) throws IOException {
long count = 0;
- Iterator<?> iterator = new SequenceFileValueIterator<Writable>(path, true, conf);
+ Iterator<?> iterator = new SequenceFileValueIterator<>(path, true, conf);
while (iterator.hasNext()) {
iterator.next();
count++;
@@ -222,7 +222,7 @@ public final class HadoopUtil {
*/
public static long countRecords(Path path, PathType pt, PathFilter filter, Configuration conf) throws IOException {
long count = 0;
- Iterator<?> iterator = new SequenceFileDirValueIterator<Writable>(path, pt, filter, null, true, conf);
+ Iterator<?> iterator = new SequenceFileDirValueIterator<>(path, pt, filter, null, true, conf);
while (iterator.hasNext()) {
iterator.next();
count++;
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/main/java/org/apache/mahout/common/iterator/SamplingIterable.java
----------------------------------------------------------------------
diff --git a/mr/src/main/java/org/apache/mahout/common/iterator/SamplingIterable.java b/mr/src/main/java/org/apache/mahout/common/iterator/SamplingIterable.java
index 46ef411..425b44b 100644
--- a/mr/src/main/java/org/apache/mahout/common/iterator/SamplingIterable.java
+++ b/mr/src/main/java/org/apache/mahout/common/iterator/SamplingIterable.java
@@ -35,11 +35,11 @@ public final class SamplingIterable<T> implements Iterable<T> {
@Override
public Iterator<T> iterator() {
- return new SamplingIterator<T>(delegate.iterator(), samplingRate);
+ return new SamplingIterator<>(delegate.iterator(), samplingRate);
}
public static <T> Iterable<T> maybeWrapIterable(Iterable<T> delegate, double samplingRate) {
- return samplingRate >= 1.0 ? delegate : new SamplingIterable<T>(delegate, samplingRate);
+ return samplingRate >= 1.0 ? delegate : new SamplingIterable<>(delegate, samplingRate);
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
index 1326777..817e917 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/hadoop/item/RecommenderJobTest.java
@@ -775,12 +775,12 @@ public class RecommenderJobTest extends TasteTestCase {
Map<Pair<Long, Long>, Double> similarities = readSimilarities(new File(similaritiesOutputDir, "part-r-00000"));
assertEquals(6, similarities.size());
- assertEquals(0.25, similarities.get(new Pair<Long, Long>(1L, 2L)), EPSILON);
- assertEquals(0.6666666666666666, similarities.get(new Pair<Long, Long>(1L, 3L)), EPSILON);
- assertEquals(0.5, similarities.get(new Pair<Long, Long>(1L, 4L)), EPSILON);
- assertEquals(0.3333333333333333, similarities.get(new Pair<Long, Long>(2L, 3L)), EPSILON);
- assertEquals(0.25, similarities.get(new Pair<Long, Long>(2L, 4L)), EPSILON);
- assertEquals(0.25, similarities.get(new Pair<Long, Long>(3L, 4L)), EPSILON);
+ assertEquals(0.25, similarities.get(new Pair<>(1L, 2L)), EPSILON);
+ assertEquals(0.6666666666666666, similarities.get(new Pair<>(1L, 3L)), EPSILON);
+ assertEquals(0.5, similarities.get(new Pair<>(1L, 4L)), EPSILON);
+ assertEquals(0.3333333333333333, similarities.get(new Pair<>(2L, 3L)), EPSILON);
+ assertEquals(0.25, similarities.get(new Pair<>(2L, 4L)), EPSILON);
+ assertEquals(0.25, similarities.get(new Pair<>(3L, 4L)), EPSILON);
}
/**
@@ -898,7 +898,7 @@ public class RecommenderJobTest extends TasteTestCase {
Map<Pair<Long,Long>, Double> similarities = Maps.newHashMap();
for (String line : new FileLineIterable(file)) {
String[] parts = line.split("\t");
- similarities.put(new Pair<Long,Long>(Long.parseLong(parts[0]), Long.parseLong(parts[1])),
+ similarities.put(new Pair<>(Long.parseLong(parts[0]), Long.parseLong(parts[1])),
Double.parseDouble(parts[2]));
}
return similarities;
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
index 2f8ca95..c1891c0 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/TasteTestCase.java
@@ -34,7 +34,7 @@ import java.util.List;
public abstract class TasteTestCase extends MahoutTestCase {
public static DataModel getDataModel(long[] userIDs, Double[][] prefValues) {
- FastByIDMap<PreferenceArray> result = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> result = new FastByIDMap<>();
for (int i = 0; i < userIDs.length; i++) {
List<Preference> prefsList = Lists.newArrayList();
for (int j = 0; j < prefValues[i].length; j++) {
@@ -50,7 +50,7 @@ public abstract class TasteTestCase extends MahoutTestCase {
}
public static DataModel getBooleanDataModel(long[] userIDs, boolean[][] prefs) {
- FastByIDMap<FastIDSet> result = new FastByIDMap<FastIDSet>();
+ FastByIDMap<FastIDSet> result = new FastByIDMap<>();
for (int i = 0; i < userIDs.length; i++) {
FastIDSet prefsSet = new FastIDSet();
for (int j = 0; j < prefs[i].length; j++) {
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
index cab1984..e6298bc 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/CacheTest.java
@@ -29,7 +29,7 @@ public final class CacheTest extends TasteTestCase {
@Test
public void testLotsOfGets() throws TasteException {
Retriever<Object,Object> retriever = new IdentityRetriever();
- Cache<Object,Object> cache = new Cache<Object,Object>(retriever, 1000);
+ Cache<Object,Object> cache = new Cache<>(retriever, 1000);
for (int i = 0; i < 1000000; i++) {
assertEquals(i, cache.get(i));
}
@@ -39,7 +39,7 @@ public final class CacheTest extends TasteTestCase {
public void testMixedUsage() throws TasteException {
Random random = RandomUtils.getRandom();
Retriever<Object,Object> retriever = new IdentityRetriever();
- Cache<Object,Object> cache = new Cache<Object,Object>(retriever, 1000);
+ Cache<Object,Object> cache = new Cache<>(retriever, 1000);
for (int i = 0; i < 1000000; i++) {
double r = random.nextDouble();
if (r < 0.01) {
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastByIDMapTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastByIDMapTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastByIDMapTest.java
index 9263ce7..8a4eed6 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastByIDMapTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastByIDMapTest.java
@@ -30,7 +30,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testPutAndGet() {
- FastByIDMap<Long> map = new FastByIDMap<Long>();
+ FastByIDMap<Long> map = new FastByIDMap<>();
assertNull(map.get(500000L));
map.put(500000L, 2L);
assertEquals(2L, (long) map.get(500000L));
@@ -38,7 +38,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testRemove() {
- FastByIDMap<Long> map = new FastByIDMap<Long>();
+ FastByIDMap<Long> map = new FastByIDMap<>();
map.put(500000L, 2L);
map.remove(500000L);
assertEquals(0, map.size());
@@ -48,7 +48,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testClear() {
- FastByIDMap<Long> map = new FastByIDMap<Long>();
+ FastByIDMap<Long> map = new FastByIDMap<>();
map.put(500000L, 2L);
map.clear();
assertEquals(0, map.size());
@@ -58,7 +58,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testSizeEmpty() {
- FastByIDMap<Long> map = new FastByIDMap<Long>();
+ FastByIDMap<Long> map = new FastByIDMap<>();
assertEquals(0, map.size());
assertTrue(map.isEmpty());
map.put(500000L, 2L);
@@ -93,7 +93,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testGrow() {
- FastByIDMap<String> map = new FastByIDMap<String>(1,1);
+ FastByIDMap<String> map = new FastByIDMap<>(1,1);
map.put(500000L, "alpha");
map.put(47L, "bang");
assertNull(map.get(500000L));
@@ -102,7 +102,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testVersusHashMap() {
- FastByIDMap<String> actual = new FastByIDMap<String>();
+ FastByIDMap<String> actual = new FastByIDMap<>();
Map<Long, String> expected = Maps.newHashMapWithExpectedSize(1000000);
Random r = RandomUtils.getRandom();
for (int i = 0; i < 1000000; i++) {
@@ -124,7 +124,7 @@ public final class FastByIDMapTest extends TasteTestCase {
@Test
public void testMaxSize() {
- FastByIDMap<String> map = new FastByIDMap<String>();
+ FastByIDMap<String> map = new FastByIDMap<>();
map.put(4, "bang");
assertEquals(1, map.size());
map.put(47L, "bang");
@@ -137,7 +137,7 @@ public final class FastByIDMapTest extends TasteTestCase {
private static FastByIDMap<String> buildTestFastMap() {
- FastByIDMap<String> map = new FastByIDMap<String>();
+ FastByIDMap<String> map = new FastByIDMap<>();
map.put(500000L, "alpha");
map.put(47L, "bang");
map.put(2L, "beta");
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java
index 2f27483..c27151a 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/common/FastMapTest.java
@@ -34,7 +34,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testPutAndGet() {
- Map<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<>();
assertNull(map.get("foo"));
map.put("foo", "bar");
assertEquals("bar", map.get("foo"));
@@ -42,7 +42,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testRemove() {
- Map<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<>();
map.put("foo", "bar");
map.remove("foo");
assertEquals(0, map.size());
@@ -52,7 +52,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testClear() {
- Map<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<>();
map.put("foo", "bar");
map.clear();
assertEquals(0, map.size());
@@ -62,7 +62,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testSizeEmpty() {
- Map<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<>();
assertEquals(0, map.size());
assertTrue(map.isEmpty());
map.put("foo", "bar");
@@ -88,14 +88,14 @@ public final class FastMapTest extends TasteTestCase {
@Test(expected = NullPointerException.class)
public void testNull1() {
- Map<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<>();
assertNull(map.get(null));
map.put(null, "bar");
}
@Test(expected = NullPointerException.class)
public void testNull2() {
- Map<String, String> map = new FastMap<String, String>();
+ Map<String, String> map = new FastMap<>();
map.put("foo", null);
}
@@ -110,7 +110,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testGrow() {
- Map<String, String> map = new FastMap<String, String>(1, FastMap.NO_MAX_SIZE);
+ Map<String, String> map = new FastMap<>(1, FastMap.NO_MAX_SIZE);
map.put("foo", "bar");
map.put("baz", "bang");
assertEquals("bar", map.get("foo"));
@@ -184,7 +184,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testVersusHashMap() {
- Map<Integer, String> actual = new FastMap<Integer, String>(1, 1000000);
+ Map<Integer, String> actual = new FastMap<>(1, 1000000);
Map<Integer, String> expected = Maps.newHashMapWithExpectedSize(1000000);
Random r = RandomUtils.getRandom();
for (int i = 0; i < 1000000; i++) {
@@ -206,7 +206,7 @@ public final class FastMapTest extends TasteTestCase {
@Test
public void testMaxSize() {
- Map<String, String> map = new FastMap<String, String>(1, 1);
+ Map<String, String> map = new FastMap<>(1, 1);
map.put("foo", "bar");
assertEquals(1, map.size());
map.put("baz", "bang");
@@ -218,7 +218,7 @@ public final class FastMapTest extends TasteTestCase {
}
private static FastMap<String, String> buildTestFastMap() {
- FastMap<String, String> map = new FastMap<String, String>();
+ FastMap<String, String> map = new FastMap<>();
map.put("foo", "bar");
map.put("baz", "bang");
map.put("alpha", "beta");
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousConcurrentUserDataModelTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousConcurrentUserDataModelTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousConcurrentUserDataModelTest.java
index 984ef6c..f33ba33 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousConcurrentUserDataModelTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/model/PlusAnonymousConcurrentUserDataModelTest.java
@@ -31,7 +31,7 @@ public final class PlusAnonymousConcurrentUserDataModelTest extends MahoutTestCa
* Prepares a testable object without delegate data
*/
private static PlusAnonymousConcurrentUserDataModel getTestableWithoutDelegateData(int maxConcurrentUsers) {
- FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<>();
return new PlusAnonymousConcurrentUserDataModel(new GenericDataModel(delegatePreferences), maxConcurrentUsers);
}
@@ -162,7 +162,7 @@ public final class PlusAnonymousConcurrentUserDataModelTest extends MahoutTestCa
long sampleItemID = 11;
prefs.setItemID(0, sampleItemID);
- FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<>();
delegatePreferences.put(sampleUserID, prefs);
PlusAnonymousConcurrentUserDataModel instance = getTestableWithDelegateData(10, delegatePreferences);
@@ -220,7 +220,7 @@ public final class PlusAnonymousConcurrentUserDataModelTest extends MahoutTestCa
long sampleItemID = 11;
prefs.setItemID(0, sampleItemID);
- FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<>();
delegatePreferences.put(sampleUserID, prefs);
PlusAnonymousConcurrentUserDataModel instance = getTestableWithDelegateData(10, delegatePreferences);
@@ -249,7 +249,7 @@ public final class PlusAnonymousConcurrentUserDataModelTest extends MahoutTestCa
long sampleItemID = 11;
prefs.setItemID(0, sampleItemID);
- FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<>();
delegatePreferences.put(sampleUserID, prefs);
PlusAnonymousConcurrentUserDataModel instance = getTestableWithDelegateData(10, delegatePreferences);
@@ -284,7 +284,7 @@ public final class PlusAnonymousConcurrentUserDataModelTest extends MahoutTestCa
long sampleItemID2 = 22;
prefs.setItemID(1, sampleItemID2);
- FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> delegatePreferences = new FastByIDMap<>();
delegatePreferences.put(sampleUserID, prefs);
PlusAnonymousConcurrentUserDataModel instance = getTestableWithDelegateData(10, delegatePreferences);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/SamplingCandidateItemsStrategyTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/SamplingCandidateItemsStrategyTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/SamplingCandidateItemsStrategyTest.java
index 687b2b1..088a203 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/SamplingCandidateItemsStrategyTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/SamplingCandidateItemsStrategyTest.java
@@ -53,7 +53,7 @@ public final class SamplingCandidateItemsStrategyTest extends TasteTestCase {
PreferenceArray prefArrayOfUser123 = new GenericUserPreferenceArray(prefsOfUser123);
- FastByIDMap<PreferenceArray> userData = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> userData = new FastByIDMap<>();
userData.put(123L, prefArrayOfUser123);
userData.put(456L, new GenericUserPreferenceArray(prefsOfUser456));
userData.put(789L, new GenericUserPreferenceArray(prefsOfUser789));
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java
index 23fa38f..e98bd5e 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ALSWRFactorizerTest.java
@@ -64,7 +64,7 @@ public class ALSWRFactorizerTest extends TasteTestCase {
@Before
public void setUp() throws Exception {
super.setUp();
- FastByIDMap<PreferenceArray> userData = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> userData = new FastByIDMap<>();
userData.put(1L, new GenericUserPreferenceArray(Arrays.asList(new GenericPreference(1L, 1L, 5.0f),
new GenericPreference(1L, 2L, 5.0f),
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/FilePersistenceStrategyTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/FilePersistenceStrategyTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/FilePersistenceStrategyTest.java
index eb8a356..6057c73 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/FilePersistenceStrategyTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/FilePersistenceStrategyTest.java
@@ -27,8 +27,8 @@ public class FilePersistenceStrategyTest extends TasteTestCase {
@Test
public void persistAndLoad() throws Exception {
- FastByIDMap<Integer> userIDMapping = new FastByIDMap<Integer>();
- FastByIDMap<Integer> itemIDMapping = new FastByIDMap<Integer>();
+ FastByIDMap<Integer> userIDMapping = new FastByIDMap<>();
+ FastByIDMap<Integer> itemIDMapping = new FastByIDMap<>();
userIDMapping.put(123, 0);
userIDMapping.put(456, 1);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ParallelSGDFactorizerTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ParallelSGDFactorizerTest.java b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ParallelSGDFactorizerTest.java
index 8a91e7a..11af863 100644
--- a/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ParallelSGDFactorizerTest.java
+++ b/mr/src/test/java/org/apache/mahout/cf/taste/impl/recommender/svd/ParallelSGDFactorizerTest.java
@@ -110,7 +110,7 @@ public class ParallelSGDFactorizerTest extends TasteTestCase {
Matrix ratings = users.times(items);
normalize(ratings, 5);
- FastByIDMap<PreferenceArray> userData = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> userData = new FastByIDMap<>();
for (int userIndex = 0; userIndex < numUsers; userIndex++) {
List<Preference> row= Lists.newArrayList();
for (int itemIndex = 0; itemIndex < numItems; itemIndex++) {
@@ -130,7 +130,7 @@ public class ParallelSGDFactorizerTest extends TasteTestCase {
this.lambda = 0.01;
this.numIterations = 1000;
- FastByIDMap<PreferenceArray> userData = new FastByIDMap<PreferenceArray>();
+ FastByIDMap<PreferenceArray> userData = new FastByIDMap<>();
userData.put(1L, new GenericUserPreferenceArray(Arrays.asList(new GenericPreference(1L, 1L, 5.0f),
new GenericPreference(1L, 2L, 5.0f),
@@ -156,7 +156,7 @@ public class ParallelSGDFactorizerTest extends TasteTestCase {
shuffler.shuffle();
shuffler.stage();
- FastByIDMap<FastByIDMap<Boolean>> checked = new FastByIDMap<FastByIDMap<Boolean>>();
+ FastByIDMap<FastByIDMap<Boolean>> checked = new FastByIDMap<>();
for (int i = 0; i < shuffler.size(); i++) {
Preference pref=shuffler.get(i);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java b/mr/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java
index a9541c9..46d861c 100644
--- a/mr/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java
+++ b/mr/src/test/java/org/apache/mahout/classifier/naivebayes/training/IndexInstancesMapperTest.java
@@ -43,7 +43,7 @@ public class IndexInstancesMapperTest extends MahoutTestCase {
ctx = EasyMock.createMock(Mapper.Context.class);
instance = new VectorWritable(new DenseVector(new double[] { 1, 0, 1, 1, 0 }));
- labelIndex = new OpenObjectIntHashMap<String>();
+ labelIndex = new OpenObjectIntHashMap<>();
labelIndex.put("bird", 0);
labelIndex.put("cat", 1);
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java b/mr/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
index 35de87e..097fd74 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
@@ -181,7 +181,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T1_KEY, String.valueOf(3.1));
conf.set(CanopyConfigKeys.T2_KEY, String.valueOf(2.1));
conf.set(CanopyConfigKeys.CF_KEY, "0");
- DummyRecordWriter<Text, VectorWritable> writer = new DummyRecordWriter<Text, VectorWritable>();
+ DummyRecordWriter<Text, VectorWritable> writer = new DummyRecordWriter<>();
Mapper<WritableComparable<?>, VectorWritable, Text, VectorWritable>.Context context = DummyRecordWriter
.build(mapper, conf, writer);
mapper.setup(context);
@@ -217,7 +217,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T1_KEY, String.valueOf(3.1));
conf.set(CanopyConfigKeys.T2_KEY, String.valueOf(2.1));
conf.set(CanopyConfigKeys.CF_KEY, "0");
- DummyRecordWriter<Text, VectorWritable> writer = new DummyRecordWriter<Text, VectorWritable>();
+ DummyRecordWriter<Text, VectorWritable> writer = new DummyRecordWriter<>();
Mapper<WritableComparable<?>, VectorWritable, Text, VectorWritable>.Context context = DummyRecordWriter
.build(mapper, conf, writer);
mapper.setup(context);
@@ -253,7 +253,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T1_KEY, String.valueOf(3.1));
conf.set(CanopyConfigKeys.T2_KEY, String.valueOf(2.1));
conf.set(CanopyConfigKeys.CF_KEY, "0");
- DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<Text, ClusterWritable>();
+ DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<>();
Reducer<Text, VectorWritable, Text, ClusterWritable>.Context context = DummyRecordWriter
.build(reducer, conf, writer, Text.class, VectorWritable.class);
reducer.setup(context);
@@ -287,7 +287,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T1_KEY, String.valueOf(3.1));
conf.set(CanopyConfigKeys.T2_KEY, String.valueOf(2.1));
conf.set(CanopyConfigKeys.CF_KEY, "0");
- DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<Text, ClusterWritable>();
+ DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<>();
Reducer<Text, VectorWritable, Text, ClusterWritable>.Context context =
DummyRecordWriter.build(reducer, conf, writer, Text.class, VectorWritable.class);
reducer.setup(context);
@@ -336,14 +336,14 @@ public final class TestCanopyCreation extends MahoutTestCase {
assertEquals("1st key", "C-0", key.toString());
List<Pair<Double,Double>> refCenters = Lists.newArrayList();
- refCenters.add(new Pair<Double,Double>(1.5,1.5));
- refCenters.add(new Pair<Double,Double>(4.333333333333334,4.333333333333334));
- Pair<Double,Double> c = new Pair<Double,Double>(clusterWritable.getValue() .getCenter().get(0),
+ refCenters.add(new Pair<>(1.5,1.5));
+ refCenters.add(new Pair<>(4.333333333333334,4.333333333333334));
+ Pair<Double,Double> c = new Pair<>(clusterWritable.getValue() .getCenter().get(0),
clusterWritable.getValue().getCenter().get(1));
assertTrue("center "+c+" not found", findAndRemove(c, refCenters, EPSILON));
assertTrue("more to come", reader.next(key, clusterWritable));
assertEquals("2nd key", "C-1", key.toString());
- c = new Pair<Double,Double>(clusterWritable.getValue().getCenter().get(0),
+ c = new Pair<>(clusterWritable.getValue().getCenter().get(0),
clusterWritable.getValue().getCenter().get(1));
assertTrue("center " + c + " not found", findAndRemove(c, refCenters, EPSILON));
assertFalse("more to come", reader.next(key, clusterWritable));
@@ -391,14 +391,14 @@ public final class TestCanopyCreation extends MahoutTestCase {
assertEquals("1st key", "C-0", key.toString());
List<Pair<Double,Double>> refCenters = Lists.newArrayList();
- refCenters.add(new Pair<Double,Double>(1.8,1.8));
- refCenters.add(new Pair<Double,Double>(4.433333333333334, 4.433333333333334));
- Pair<Double,Double> c = new Pair<Double,Double>(clusterWritable.getValue().getCenter().get(0),
+ refCenters.add(new Pair<>(1.8,1.8));
+ refCenters.add(new Pair<>(4.433333333333334, 4.433333333333334));
+ Pair<Double,Double> c = new Pair<>(clusterWritable.getValue().getCenter().get(0),
clusterWritable.getValue().getCenter().get(1));
assertTrue("center "+c+" not found", findAndRemove(c, refCenters, EPSILON));
assertTrue("more to come", reader.next(key, clusterWritable));
assertEquals("2nd key", "C-1", key.toString());
- c = new Pair<Double,Double>(clusterWritable.getValue().getCenter().get(0),
+ c = new Pair<>(clusterWritable.getValue().getCenter().get(0),
clusterWritable.getValue().getCenter().get(1));
assertTrue("center "+c+" not found", findAndRemove(c, refCenters, EPSILON));
assertFalse("more to come", reader.next(key, clusterWritable));
@@ -610,7 +610,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T3_KEY, String.valueOf(1.1));
conf.set(CanopyConfigKeys.T4_KEY, String.valueOf(0.1));
conf.set(CanopyConfigKeys.CF_KEY, "0");
- DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<Text, ClusterWritable>();
+ DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<>();
Reducer<Text, VectorWritable, Text, ClusterWritable>.Context context = DummyRecordWriter
.build(reducer, conf, writer, Text.class, VectorWritable.class);
reducer.setup(context);
@@ -631,7 +631,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T1_KEY, String.valueOf(3.1));
conf.set(CanopyConfigKeys.T2_KEY, String.valueOf(2.1));
conf.set(CanopyConfigKeys.CF_KEY, "3");
- DummyRecordWriter<Text, VectorWritable> writer = new DummyRecordWriter<Text, VectorWritable>();
+ DummyRecordWriter<Text, VectorWritable> writer = new DummyRecordWriter<>();
Mapper<WritableComparable<?>, VectorWritable, Text, VectorWritable>.Context context = DummyRecordWriter
.build(mapper, conf, writer);
mapper.setup(context);
@@ -661,7 +661,7 @@ public final class TestCanopyCreation extends MahoutTestCase {
conf.set(CanopyConfigKeys.T1_KEY, String.valueOf(3.1));
conf.set(CanopyConfigKeys.T2_KEY, String.valueOf(2.1));
conf.set(CanopyConfigKeys.CF_KEY, "3");
- DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<Text, ClusterWritable>();
+ DummyRecordWriter<Text, ClusterWritable> writer = new DummyRecordWriter<>();
Reducer<Text, VectorWritable, Text, ClusterWritable>.Context context = DummyRecordWriter
.build(reducer, conf, writer, Text.class, VectorWritable.class);
reducer.setup(context);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java b/mr/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
index 5666765..94762e3 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
@@ -174,7 +174,7 @@ public final class TestKmeansClustering extends MahoutTestCase {
// now compare the expected clusters with actual
Path clusteredPointsPath = new Path(outputPath, "clusteredPoints");
int[] expect = EXPECTED_NUM_POINTS[k];
- DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable>();
+ DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<>();
// The key is the clusterId, the value is the weighted vector
for (Pair<IntWritable,WeightedPropertyVectorWritable> record : new SequenceFileIterable<IntWritable,WeightedPropertyVectorWritable>(
new Path(clusteredPointsPath, "part-m-0"), conf)) {
@@ -228,7 +228,7 @@ public final class TestKmeansClustering extends MahoutTestCase {
// now compare the expected clusters with actual
Path clusteredPointsPath = new Path(outputPath, "clusteredPoints");
int[] expect = EXPECTED_NUM_POINTS[k];
- DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable>();
+ DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<>();
// The key is the clusterId, the value is the weighted vector
for (Pair<IntWritable,WeightedPropertyVectorWritable> record : new SequenceFileIterable<IntWritable,WeightedPropertyVectorWritable>(
new Path(clusteredPointsPath, "part-m-0"), conf)) {
@@ -283,7 +283,7 @@ public final class TestKmeansClustering extends MahoutTestCase {
Path clusteredPointsPath = new Path(outputPath, "clusteredPoints");
// assertEquals("output dir files?", 4, outFiles.length);
int[] expect = EXPECTED_NUM_POINTS[k];
- DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable>();
+ DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<>();
// The key is the clusterId, the value is the weighted vector
for (Pair<IntWritable,WeightedPropertyVectorWritable> record : new SequenceFileIterable<IntWritable,WeightedPropertyVectorWritable>(
new Path(clusteredPointsPath, "part-m-00000"), conf)) {
@@ -311,7 +311,7 @@ public final class TestKmeansClustering extends MahoutTestCase {
CanopyDriver.run(conf, pointsPath, outputPath, new ManhattanDistanceMeasure(), 3.1, 2.1, false, 0.0, false);
DummyOutputCollector<Text, ClusterWritable> collector1 =
- new DummyOutputCollector<Text, ClusterWritable>();
+ new DummyOutputCollector<>();
FileStatus[] outParts = FileSystem.get(conf).globStatus(
new Path(outputPath, "clusters-0-final/*-0*"));
@@ -354,7 +354,7 @@ public final class TestKmeansClustering extends MahoutTestCase {
// now compare the expected clusters with actual
Path clusteredPointsPath = new Path(kmeansOutput, "clusteredPoints");
- DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable>();
+ DummyOutputCollector<IntWritable,WeightedPropertyVectorWritable> collector = new DummyOutputCollector<>();
// The key is the clusterId, the value is the weighted vector
for (Pair<IntWritable,WeightedPropertyVectorWritable> record : new SequenceFileIterable<IntWritable,WeightedPropertyVectorWritable>(
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
index 6e0cd18..cd52bbd 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestAffinityMatrixInputJob.java
@@ -75,7 +75,7 @@ public class TestAffinityMatrixInputJob extends MahoutTestCase {
// set up the dummy writer and the M/R context
DummyRecordWriter<IntWritable, MatrixEntryWritable> writer =
- new DummyRecordWriter<IntWritable, MatrixEntryWritable>();
+ new DummyRecordWriter<>();
Mapper<LongWritable, Text, IntWritable, MatrixEntryWritable>.Context
context = DummyRecordWriter.build(mapper, conf, writer);
@@ -102,7 +102,7 @@ public class TestAffinityMatrixInputJob extends MahoutTestCase {
// set up the dummy writer and the M/R context
DummyRecordWriter<IntWritable, MatrixEntryWritable> mapWriter =
- new DummyRecordWriter<IntWritable, MatrixEntryWritable>();
+ new DummyRecordWriter<>();
Mapper<LongWritable, Text, IntWritable, MatrixEntryWritable>.Context
mapContext = DummyRecordWriter.build(mapper, conf, mapWriter);
@@ -117,7 +117,7 @@ public class TestAffinityMatrixInputJob extends MahoutTestCase {
// now reduce the data
AffinityMatrixInputReducer reducer = new AffinityMatrixInputReducer();
DummyRecordWriter<IntWritable, VectorWritable> redWriter =
- new DummyRecordWriter<IntWritable, VectorWritable>();
+ new DummyRecordWriter<>();
Reducer<IntWritable, MatrixEntryWritable,
IntWritable, VectorWritable>.Context redContext = DummyRecordWriter
.build(reducer, conf, redWriter, IntWritable.class, MatrixEntryWritable.class);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
index 7d4ec1f..c256890 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestMatrixDiagonalizeJob.java
@@ -59,7 +59,7 @@ public class TestMatrixDiagonalizeJob extends MahoutTestCase {
// set up the dummy writers
DummyRecordWriter<NullWritable, IntDoublePairWritable> writer =
- new DummyRecordWriter<NullWritable, IntDoublePairWritable>();
+ new DummyRecordWriter<>();
Mapper<IntWritable, VectorWritable, NullWritable, IntDoublePairWritable>.Context
context = DummyRecordWriter.build(mapper, conf, writer);
@@ -83,7 +83,7 @@ public class TestMatrixDiagonalizeJob extends MahoutTestCase {
// set up the dummy writers
DummyRecordWriter<NullWritable, IntDoublePairWritable> mapWriter =
- new DummyRecordWriter<NullWritable, IntDoublePairWritable>();
+ new DummyRecordWriter<>();
Mapper<IntWritable, VectorWritable, NullWritable, IntDoublePairWritable>.Context
mapContext = DummyRecordWriter.build(mapper, conf, mapWriter);
@@ -97,7 +97,7 @@ public class TestMatrixDiagonalizeJob extends MahoutTestCase {
// now perform the reduction
MatrixDiagonalizeReducer reducer = new MatrixDiagonalizeReducer();
DummyRecordWriter<NullWritable, VectorWritable> redWriter = new
- DummyRecordWriter<NullWritable, VectorWritable>();
+ DummyRecordWriter<>();
Reducer<NullWritable, IntDoublePairWritable, NullWritable, VectorWritable>.Context
redContext = DummyRecordWriter.build(reducer, conf, redWriter,
NullWritable.class, IntDoublePairWritable.class);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
index f317f6e..c971572 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestUnitVectorizerJob.java
@@ -41,7 +41,7 @@ public class TestUnitVectorizerJob extends MahoutTestCase {
// set up the dummy writers
DummyRecordWriter<IntWritable, VectorWritable> writer = new
- DummyRecordWriter<IntWritable, VectorWritable>();
+ DummyRecordWriter<>();
Mapper<IntWritable, VectorWritable, IntWritable, VectorWritable>.Context
context = DummyRecordWriter.build(mapper, conf, writer);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
index 9091efe..e09bbe4 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorCache.java
@@ -51,7 +51,7 @@ public class TestVectorCache extends MahoutTestCase {
// can we read it from here?
SequenceFileValueIterator<VectorWritable> iterator =
- new SequenceFileValueIterator<VectorWritable>(path, true, conf);
+ new SequenceFileValueIterator<>(path, true, conf);
try {
VectorWritable old = iterator.next();
// test if the values are identical
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
index 2fd83e2..8cd52f4 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/spectral/TestVectorMatrixMultiplicationJob.java
@@ -48,7 +48,7 @@ public class TestVectorMatrixMultiplicationJob extends MahoutTestCase {
// set up all the parameters for the job
Vector toSave = new DenseVector(VECTOR);
DummyRecordWriter<IntWritable, VectorWritable> writer = new
- DummyRecordWriter<IntWritable, VectorWritable>();
+ DummyRecordWriter<>();
Mapper<IntWritable, VectorWritable, IntWritable, VectorWritable>.Context
context = DummyRecordWriter.build(mapper, conf, writer);
mapper.setup(toSave);
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java b/mr/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java
index 4075fe4..5c73bbc 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/spectral/kmeans/TestEigenSeedGenerator.java
@@ -79,7 +79,7 @@ public final class TestEigenSeedGenerator extends MahoutTestCase {
EigenSeedGenerator.buildFromEigens(conf, input, output, 3, new ManhattanDistanceMeasure());
int clusterCount = 0;
- Collection<Integer> set = new HashSet<Integer>();
+ Collection<Integer> set = new HashSet<>();
Vector v[] = new Vector[3];
for (ClusterWritable clusterWritable :
new SequenceFileValueIterable<ClusterWritable>(
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/streaming/cluster/DataUtils.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/streaming/cluster/DataUtils.java b/mr/src/test/java/org/apache/mahout/clustering/streaming/cluster/DataUtils.java
index 2257541..5a10a55 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/streaming/cluster/DataUtils.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/streaming/cluster/DataUtils.java
@@ -78,7 +78,7 @@ public final class DataUtils {
for (int i = 0; i < numDatapoints; ++i) {
data.add(new Centroid(i, rowSamplers.get(i % pow2N).sample(), 1));
}
- return new Pair<List<Centroid>, List<Centroid>>(data, mean);
+ return new Pair<>(data, mean);
}
/**
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java b/mr/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java
index 9b582b4..dbf05be 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/streaming/mapreduce/StreamingKMeansTestMR.java
@@ -218,8 +218,7 @@ public class StreamingKMeansTestMR extends MahoutTestCase {
@Test
public void testHypercubeMapReduce() throws IOException {
MapReduceDriver<Writable, VectorWritable, IntWritable, CentroidWritable, IntWritable, CentroidWritable>
- mapReduceDriver = new MapReduceDriver<Writable, VectorWritable, IntWritable, CentroidWritable,
- IntWritable, CentroidWritable>(new StreamingKMeansMapper(), new StreamingKMeansReducer());
+ mapReduceDriver = new MapReduceDriver<>(new StreamingKMeansMapper(), new StreamingKMeansReducer());
Configuration configuration = mapReduceDriver.getConfiguration();
configure(configuration);
@@ -252,7 +251,7 @@ public class StreamingKMeansTestMR extends MahoutTestCase {
@Override
public org.apache.hadoop.mrunit.types.Pair<IntWritable, CentroidWritable> apply(
org.apache.mahout.common.Pair<IntWritable, CentroidWritable> input) {
- return new org.apache.hadoop.mrunit.types.Pair<IntWritable, CentroidWritable>(
+ return new org.apache.hadoop.mrunit.types.Pair<>(
input.getFirst(), input.getSecond());
}
})));
http://git-wip-us.apache.org/repos/asf/mahout/blob/02ff22f0/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java
----------------------------------------------------------------------
diff --git a/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java b/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java
index 0934ff7..d5a9a90 100644
--- a/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java
+++ b/mr/src/test/java/org/apache/mahout/clustering/topdown/postprocessor/ClusterCountReaderTest.java
@@ -106,7 +106,7 @@ public final class ClusterCountReaderTest extends MahoutTestCase {
private static void verifyThatNumberOfClustersIsCorrect(Configuration conf, Path clusteredPointsPath) {
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 :