Author: ssc
Date: Mon Jun 13 10:00:49 2011
New Revision: 1135073
URL: http://svn.apache.org/viewvc?rev=1135073&view=rev
Log:
minor refactoring
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/FixedSizePriorityQueue.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/TasteHadoopUtils.java
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorSplitterMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
mahout/trunk/integration/src/main/java/org/apache/mahout/text/PrefixAdditionFilter.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/FixedSizePriorityQueue.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/FixedSizePriorityQueue.java?rev=1135073&r1=1135072&r2=1135073&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/FixedSizePriorityQueue.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/common/FixedSizePriorityQueue.java
Mon Jun 13 10:00:49 2011
@@ -32,14 +32,17 @@ import java.util.Queue;
abstract class FixedSizePriorityQueue<T> {
private final int k;
- private final Comparator<? super T> comparator;
+ private final Comparator<? super T> queueingComparator;
+ private final Comparator<? super T> sortingComparator;
private final Queue<T> queue;
FixedSizePriorityQueue(int k, Comparator<? super T> comparator) {
Preconditions.checkArgument(k > 0);
this.k = k;
- this.comparator = Preconditions.checkNotNull(comparator);
- this.queue = new PriorityQueue<T>(k + 1, queueingComparator(comparator));
+ Preconditions.checkNotNull(comparator);
+ this.queueingComparator = queueingComparator(comparator);
+ this.sortingComparator = sortingComparator(comparator);
+ this.queue = new PriorityQueue<T>(k + 1, queueingComparator);
}
abstract Comparator<? super T> queueingComparator(Comparator<? super T>
stdComparator);
@@ -48,7 +51,7 @@ abstract class FixedSizePriorityQueue<T>
public void offer(T item) {
if (queue.size() < k) {
queue.add(item);
- } else if (comparator.compare(item, queue.peek()) > 0) {
+ } else if (queueingComparator.compare(item, queue.peek()) > 0) {
queue.add(item);
queue.poll();
}
@@ -64,7 +67,7 @@ abstract class FixedSizePriorityQueue<T>
public List<T> retrieve() {
List<T> topItems = Lists.newArrayList(queue);
- Collections.sort(topItems, sortingComparator(comparator));
+ Collections.sort(topItems, sortingComparator);
return topItems;
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/TasteHadoopUtils.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/TasteHadoopUtils.java?rev=1135073&r1=1135072&r2=1135073&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/TasteHadoopUtils.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/TasteHadoopUtils.java
Mon Jun 13 10:00:49 2011
@@ -18,6 +18,9 @@
package org.apache.mahout.cf.taste.hadoop;
import com.google.common.base.Charsets;
+import com.google.common.io.ByteStreams;
+import com.google.common.io.Closeables;
+import com.google.common.primitives.Bytes;
import com.google.common.primitives.Longs;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -86,13 +89,14 @@ public final class TasteHadoopUtils {
FileSystem fs = outputDir.getFileSystem(conf);
Path outputFile = fs.listStatus(outputDir,
PathFilters.partFilter())[0].getPath();
InputStream in = null;
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
try {
in = fs.open(outputFile);
- ByteArrayOutputStream out = new ByteArrayOutputStream();
IOUtils.copyBytes(in, out, conf);
return Integer.parseInt(new String(out.toByteArray(),
Charsets.UTF_8).trim());
} finally {
- IOUtils.closeStream(in);
+ Closeables.closeQuietly(in);
+ Closeables.closeQuietly(out);
}
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorSplitterMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorSplitterMapper.java?rev=1135073&r1=1135072&r2=1135073&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorSplitterMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/item/UserVectorSplitterMapper.java
Mon Jun 13 10:00:49 2011
@@ -17,6 +17,7 @@
package org.apache.mahout.cf.taste.hadoop.item;
+import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -71,7 +72,7 @@ public final class UserVectorSplitterMap
}
}
} finally {
- IOUtils.closeStream(in);
+ Closeables.closeQuietly(in);
}
}
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java?rev=1135073&r1=1135072&r2=1135073&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/math/hadoop/similarity/RowSimilarityJob.java
Mon Jun 13 10:00:49 2011
@@ -265,10 +265,11 @@ public class RowSimilarityJob extends Ab
double valueB = weightedOccurrences[m].getValue();
if (rowA <= rowB) {
rowPair.set(rowA, rowB, weightA, weightB);
+ coocurrence.set(column.get(), valueA, valueB);
} else {
rowPair.set(rowB, rowA, weightB, weightA);
+ coocurrence.set(column.get(), valueB, valueA);
}
- coocurrence.set(column.get(), valueA, valueB);
ctx.write(rowPair, coocurrence);
numPairs++;
}
Modified:
mahout/trunk/integration/src/main/java/org/apache/mahout/text/PrefixAdditionFilter.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/PrefixAdditionFilter.java?rev=1135073&r1=1135072&r2=1135073&view=diff
==============================================================================
---
mahout/trunk/integration/src/main/java/org/apache/mahout/text/PrefixAdditionFilter.java
(original)
+++
mahout/trunk/integration/src/main/java/org/apache/mahout/text/PrefixAdditionFilter.java
Mon Jun 13 10:00:49 2011
@@ -17,6 +17,7 @@
package org.apache.mahout.text;
+import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -61,7 +62,7 @@ public final class PrefixAdditionFilter
: current.getName() + Path.SEPARATOR + fst.getPath().getName();
writer.write(prefix + Path.SEPARATOR + name, file.toString());
} finally {
- IOUtils.closeStream(in);
+ Closeables.closeQuietly(in);
}
}
}
