Author: tdunning
Date: Sat Jun 5 07:04:22 2010
New Revision: 951663
URL: http://svn.apache.org/viewvc?rev=951663&view=rev
Log:
MAHOUT-409 - small fixes to decrease the findBugs output.
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersKeyWritable.java
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/EigenStatus.java
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Beta.java
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyGroupComparator.java
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersKeyWritable.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersKeyWritable.java?rev=951663&r1=951662&r2=951663&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersKeyWritable.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/similarity/item/CountUsersKeyWritable.java
Sat Jun 5 07:04:22 2010
@@ -17,11 +17,6 @@
package org.apache.mahout.cf.taste.hadoop.similarity.item;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.Serializable;
-
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
import org.apache.hadoop.mapreduce.Partitioner;
@@ -29,6 +24,10 @@ import org.apache.mahout.common.RandomUt
import org.apache.mahout.math.VarLongWritable;
import org.apache.mahout.math.Varint;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
/**
* a writable key that is used by {...@link CountUsersMapper} and {...@link
CountUsersReducer} to
* count unique users by sending all userIDs to the same reducer and have them
sorted in
@@ -92,7 +91,7 @@ public class CountUsersKeyWritable imple
/**
* all userIDs go to the same reducer
*/
- public static class CountUsersGroupComparator extends WritableComparator
implements Serializable {
+ public static class CountUsersGroupComparator extends WritableComparator {
public CountUsersGroupComparator() {
super(CountUsersKeyWritable.class, true);
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java?rev=951663&r1=951662&r2=951663&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/common/IntPairWritable.java
Sat Jun 5 07:04:22 2010
@@ -17,16 +17,16 @@
package org.apache.mahout.common;
+import org.apache.hadoop.io.BinaryComparable;
+import org.apache.hadoop.io.WritableComparable;
+import org.apache.hadoop.io.WritableComparator;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
-import org.apache.hadoop.io.BinaryComparable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.io.WritableComparator;
-
/**
* A {...@link WritableComparable} which encapsulates an ordered pair of
signed integers.
*/
@@ -146,7 +146,7 @@ public final class IntPairWritable
WritableComparator.define(IntPairWritable.class, new Comparator());
}
- public static final class Comparator extends WritableComparator implements
Serializable {
+ public static final class Comparator extends WritableComparator {
public Comparator() {
super(IntPairWritable.class);
}
@@ -185,7 +185,7 @@ public final class IntPairWritable
/**
* Compare only the first part of the pair, so that reduce is called once
for each value of the first part.
*/
- public static class FirstGroupingComparator extends WritableComparator
implements Serializable {
+ public static class FirstGroupingComparator extends WritableComparator {
public FirstGroupingComparator() {
super(IntPairWritable.class);
Modified:
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/EigenStatus.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/EigenStatus.java?rev=951663&r1=951662&r2=951663&view=diff
==============================================================================
---
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/EigenStatus.java
(original)
+++
mahout/trunk/math/src/main/java/org/apache/mahout/math/decomposer/EigenStatus.java
Sat Jun 5 07:04:22 2010
@@ -20,7 +20,7 @@ package org.apache.mahout.math.decompose
public class EigenStatus {
private final double eigenValue;
private final double cosAngle;
- private Boolean inProgress;
+ private volatile Boolean inProgress;
public EigenStatus(double eigenValue, double cosAngle) {
this(eigenValue, cosAngle, true);
@@ -41,14 +41,10 @@ public class EigenStatus {
}
public boolean inProgress() {
- synchronized (inProgress) {
- return inProgress;
- }
+ return inProgress;
}
void setInProgress(boolean status) {
- synchronized (inProgress) {
- inProgress = status;
- }
+ inProgress = status;
}
}
Modified:
mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Beta.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Beta.java?rev=951663&r1=951662&r2=951663&view=diff
==============================================================================
--- mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Beta.java
(original)
+++ mahout/trunk/math/src/main/java/org/apache/mahout/math/jet/random/Beta.java
Sat Jun 5 07:04:22 2010
@@ -68,7 +68,11 @@ public class Beta extends AbstractContin
a_ = a - 1.0;
b_ = b - 1.0;
double c = (b * b_) / (a * a_);
- t = (c == 1.0) ? 0.5 : (1.0 - Math.sqrt(c)) / (1.0 - c); // t = t_opt
+ if (Math.abs(c - 1.0) < 1e-8) {
+ t = 0.5;
+ } else {
+ t = (1.0 - Math.sqrt(c)) / (1.0 - c);
+ }
fa = Math.exp(a_ * Math.log(t));
fb = Math.exp(b_ * Math.log(1.0 - t)); // f(t) = fa * fb
Modified:
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyGroupComparator.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyGroupComparator.java?rev=951663&r1=951662&r2=951663&view=diff
==============================================================================
---
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyGroupComparator.java
(original)
+++
mahout/trunk/utils/src/main/java/org/apache/mahout/utils/nlp/collocations/llr/GramKeyGroupComparator.java
Sat Jun 5 07:04:22 2010
@@ -17,15 +17,13 @@
package org.apache.mahout.utils.nlp.collocations.llr;
-import java.io.Serializable;
-
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
/** Group GramKeys based on their Gram, ignoring the secondary sort key, so
that all keys with the same Gram are sent
* to the same call of the reduce method, sorted in natural order (for
GramKeys).
*/
-public class GramKeyGroupComparator extends WritableComparator implements
Serializable {
+public class GramKeyGroupComparator extends WritableComparator {
protected GramKeyGroupComparator() {
super(GramKey.class, true);
