You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sr...@apache.org on 2009/11/28 08:51:17 UTC
svn commit: r885070 - in
/lucene/mahout/trunk/core/src/main/java/org/apache/mahout:
cf/taste/impl/common/ cf/taste/impl/model/jdbc/ cf/taste/impl/neighborhood/
cf/taste/impl/recommender/ classifier/bayes/common/
classifier/bayes/mapreduce/common/ clust...
Author: srowen
Date: Sat Nov 28 07:51:16 2009
New Revision: 885070
URL: http://svn.apache.org/viewvc?rev=885070&view=rev
Log:
Changes from FindBugs
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/ByScoreLabelResultComparator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/callback/ForestPredictions.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeap.java
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverage.java Sat Nov 28 07:51:16 2009
@@ -68,17 +68,17 @@
}
@Override
- public int getCount() {
+ public synchronized int getCount() {
return (int) count;
}
@Override
- public double getAverage() {
+ public synchronized double getAverage() {
return (double) average;
}
@Override
- public String toString() {
+ public synchronized String toString() {
return String.valueOf(average);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/CompactRunningAverageAndStdDev.java Sat Nov 28 07:51:16 2009
@@ -28,7 +28,7 @@
}
@Override
- public double getStandardDeviation() {
+ public synchronized double getStandardDeviation() {
return (double) stdDev;
}
@@ -65,7 +65,7 @@
}
@Override
- public String toString() {
+ public synchronized String toString() {
return String.valueOf(String.valueOf(getAverage()) + ',' + stdDev);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FastIDSet.java Sat Nov 28 07:51:16 2009
@@ -154,10 +154,8 @@
public boolean addAll(FastIDSet c) {
boolean changed = false;
for (long k : c.keys) {
- if (k != NULL && k != REMOVED) {
- if (add(k)) {
- changed = true;
- }
+ if (k != NULL && k != REMOVED && add(k)) {
+ changed = true;
}
}
return changed;
@@ -176,10 +174,8 @@
public boolean removeAll(FastIDSet c) {
boolean changed = false;
for (long k : c.keys) {
- if (k != NULL && k != REMOVED) {
- if (remove(k)) {
- changed = true;
- }
+ if (k != NULL && k != REMOVED && remove(k)) {
+ changed = true;
}
}
return changed;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverage.java Sat Nov 28 07:51:16 2009
@@ -73,17 +73,17 @@
}
@Override
- public int getCount() {
+ public synchronized int getCount() {
return count;
}
@Override
- public double getAverage() {
+ public synchronized double getAverage() {
return average;
}
@Override
- public String toString() {
+ public synchronized String toString() {
return String.valueOf(average);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/FullRunningAverageAndStdDev.java Sat Nov 28 07:51:16 2009
@@ -28,7 +28,7 @@
}
@Override
- public double getStandardDeviation() {
+ public synchronized double getStandardDeviation() {
return stdDev;
}
@@ -65,7 +65,7 @@
}
@Override
- public String toString() {
+ public synchronized String toString() {
return String.valueOf(String.valueOf(getAverage()) + ',' + stdDev);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/common/WeightedRunningAverage.java Sat Nov 28 07:51:16 2009
@@ -72,23 +72,23 @@
average += (delta * weight) / totalWeight;
}
- public double getTotalWeight() {
+ public synchronized double getTotalWeight() {
return totalWeight;
}
/** @return {@link #getTotalWeight()} */
@Override
- public int getCount() {
+ public synchronized int getCount() {
return (int) totalWeight;
}
@Override
- public double getAverage() {
+ public synchronized double getAverage() {
return average;
}
@Override
- public String toString() {
+ public synchronized String toString() {
return String.valueOf(average);
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/model/jdbc/ConnectionPoolDataSource.java Sat Nov 28 07:51:16 2009
@@ -38,15 +38,7 @@
if (underlyingDataSource == null) {
throw new IllegalArgumentException("underlyingDataSource is null");
}
- ConnectionFactory connectionFactory = new ConnectionFactory() {
- @Override
- public Connection createConnection() throws SQLException {
- Connection connection = underlyingDataSource.getConnection();
- connection.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
- connection.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
- return connection;
- }
- };
+ ConnectionFactory connectionFactory = new ConfiguringConnectionFactory(underlyingDataSource);
GenericObjectPool objectPool = new GenericObjectPool();
objectPool.setTestOnBorrow(false);
objectPool.setTestOnReturn(false);
@@ -98,4 +90,21 @@
return delegate.isWrapperFor(iface);
}
+ private static class ConfiguringConnectionFactory implements ConnectionFactory {
+
+ private final DataSource underlyingDataSource;
+
+ public ConfiguringConnectionFactory(DataSource underlyingDataSource) {
+ this.underlyingDataSource = underlyingDataSource;
+ }
+
+ @Override
+ public Connection createConnection() throws SQLException {
+ Connection connection = underlyingDataSource.getConnection();
+ connection.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED);
+ connection.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT);
+ return connection;
+ }
+ }
+
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/neighborhood/NearestNUserNeighborhood.java Sat Nov 28 07:51:16 2009
@@ -23,8 +23,6 @@
import org.apache.mahout.cf.taste.impl.recommender.TopItems;
import org.apache.mahout.cf.taste.model.DataModel;
import org.apache.mahout.cf.taste.similarity.UserSimilarity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* <p>Computes a neighborhood consisting of the nearest n users to a given user. "Nearest" is defined by
@@ -32,8 +30,6 @@
*/
public final class NearestNUserNeighborhood extends AbstractUserNeighborhood {
- private static final Logger log = LoggerFactory.getLogger(NearestNUserNeighborhood.class);
-
private final int n;
private final double minSimilarity;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/GenericBooleanPrefUserBasedRecommender.java Sat Nov 28 07:51:16 2009
@@ -52,12 +52,10 @@
float totalSimilarity = 0.0f;
boolean foundAPref = false;
for (long userID : theNeighborhood) {
- if (userID != theUserID) {
- // See GenericItemBasedRecommender.doEstimatePreference() too
- if (dataModel.getPreferenceValue(userID, itemID) != null) {
- foundAPref = true;
- totalSimilarity += similarity.userSimilarity(theUserID, userID);
- }
+ // See GenericItemBasedRecommender.doEstimatePreference() too
+ if (userID != theUserID && dataModel.getPreferenceValue(userID, itemID) != null) {
+ foundAPref = true;
+ totalSimilarity += similarity.userSimilarity(theUserID, userID);
}
}
return foundAPref ? totalSimilarity : Float.NaN;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/ByScoreLabelResultComparator.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/ByScoreLabelResultComparator.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/ByScoreLabelResultComparator.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/ByScoreLabelResultComparator.java Sat Nov 28 07:51:16 2009
@@ -19,9 +19,10 @@
import org.apache.mahout.classifier.ClassifierResult;
+import java.io.Serializable;
import java.util.Comparator;
-public final class ByScoreLabelResultComparator implements Comparator<ClassifierResult> {
+public final class ByScoreLabelResultComparator implements Comparator<ClassifierResult>, Serializable {
@Override
public int compare(ClassifierResult cr1, ClassifierResult cr2) {
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureDriver.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureDriver.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureDriver.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesFeatureDriver.java Sat Nov 28 07:51:16 2009
@@ -27,16 +27,12 @@
import org.apache.hadoop.mapred.KeyValueTextInputFormat;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
import org.apache.mahout.common.StringTuple;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
/** Create and run the Bayes Feature Reader Step. */
public class BayesFeatureDriver implements BayesJob {
- private static final Logger log = LoggerFactory.getLogger(BayesFeatureDriver.class);
-
/**
* Run the job
*
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletMapper.java Sat Nov 28 07:51:16 2009
@@ -91,7 +91,13 @@
// TODO: with more than one mapper, they will all have different mixtures. Will this matter?
state.setMixture(UncommonDistributions.rDirichlet(state.totalCounts()));
return state;
- } catch (Exception e) {
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException(e);
+ } catch (InstantiationException e) {
+ throw new IllegalStateException(e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException(e);
+ } catch (IOException e) {
throw new IllegalStateException(e);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/common/TimingStatistics.java Sat Nov 28 07:51:16 2009
@@ -40,31 +40,31 @@
this.sumSquaredTime = sumSquaredTime;
}
- public int getNCalls() {
+ public synchronized int getNCalls() {
return nCalls;
}
- public long getMinTime() {
+ public synchronized long getMinTime() {
return Math.max(0, minTime);
}
- public long getMaxTime() {
+ public synchronized long getMaxTime() {
return maxTime;
}
- public long getSumTime() {
+ public synchronized long getSumTime() {
return sumTime;
}
- public double getSumSquaredTime() {
+ public synchronized double getSumSquaredTime() {
return sumSquaredTime;
}
- public long getMeanTime() {
+ public synchronized long getMeanTime() {
return nCalls == 0 ? 0 : sumTime / nCalls;
}
- public long getStdDevTime() {
+ public synchronized long getStdDevTime() {
if (nCalls == 0)
return 0;
double mean = getMeanTime();
@@ -76,7 +76,7 @@
return (long) Math.sqrt(variance);
}
- public String toString() {
+ public synchronized String toString() {
return '\n' +
"nCalls = " + nCalls + ";\n" +
"sumTime = " + sumTime / 1000000000.0f + "s;\n" +
@@ -105,8 +105,7 @@
if (elapsed > maxTime)
maxTime = elapsed;
sumTime += elapsed;
- double elapsedFP = elapsed;
- sumSquaredTime += elapsedFP * elapsedFP;
+ sumSquaredTime += (double) (elapsed * elapsed);
}
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/DecisionForest.java Sat Nov 28 07:51:16 2009
@@ -145,7 +145,7 @@
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (obj==null || !(obj instanceof DecisionForest))
+ if (!(obj instanceof DecisionForest))
return false;
DecisionForest rf = (DecisionForest)obj;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/callback/ForestPredictions.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/callback/ForestPredictions.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/callback/ForestPredictions.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/callback/ForestPredictions.java Sat Nov 28 07:51:16 2009
@@ -47,7 +47,7 @@
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (obj == null || !(obj instanceof ForestPredictions))
+ if (!(obj instanceof ForestPredictions))
return false;
ForestPredictions fp = (ForestPredictions) obj;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/data/DescriptorUtils.java Sat Nov 28 07:51:16 2009
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.StringTokenizer;
import org.apache.mahout.df.data.Dataset.Attribute;
@@ -42,7 +43,7 @@
Attribute[] attributes = new Attribute[tokenizer.countTokens()];
for (int attr = 0; attr < attributes.length; attr++) {
- String token = tokenizer.nextToken().toUpperCase();
+ String token = tokenizer.nextToken().toUpperCase(Locale.ENGLISH);
if ("I".equals(token))
attributes[attr] = Attribute.IGNORED;
else if ("N".equals(token))
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredMapper.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredMapper.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredMapper.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/df/mapreduce/MapredMapper.java Sat Nov 28 07:51:16 2009
@@ -23,8 +23,6 @@
import org.apache.hadoop.mapreduce.Mapper;
import org.apache.mahout.df.builder.TreeBuilder;
import org.apache.mahout.df.data.Dataset;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Base class for Mapred mappers. Loads common parameters from the job
@@ -32,8 +30,6 @@
public class MapredMapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT> extends
Mapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT> {
- private static final Logger log = LoggerFactory.getLogger(MapredMapper.class);
-
private boolean noOutput;
private boolean oobEstimate;
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/PFPGrowth.java Sat Nov 28 07:51:16 2009
@@ -399,7 +399,6 @@
"org.apache.hadoop.io.serializer.JavaSerialization,org.apache.hadoop.io.serializer.WritableSerialization");
DefaultStringifier<Map<String, Long>> mapStringifier = new DefaultStringifier<Map<String, Long>>(
conf, GenericsUtil.getClass(map));
- String serializedMapString = mapStringifier.toString(map);
- return serializedMapString;
+ return mapStringifier.toString(map);
}
}
Modified: lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeap.java
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeap.java?rev=885070&r1=885069&r2=885070&view=diff
==============================================================================
--- lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeap.java (original)
+++ lucene/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/fpgrowth/FrequentPatternMaxHeap.java Sat Nov 28 07:51:16 2009
@@ -102,8 +102,9 @@
int cmp = treeSetComparator.compare(least, frequentPattern);
if (cmp < 0)
least = frequentPattern;
- } else if (least == null)
+ } else {
least = frequentPattern;
+ }
}
}
}