Author: srowen
Date: Wed Mar 30 15:50:20 2011
New Revision: 1086994
URL: http://svn.apache.org/viewvc?rev=1086994&view=rev
Log:
MAHOUT-637 remove direct HBase dependency
Modified:
mahout/trunk/core/pom.xml
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Algorithm.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerReducer.java
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/string/TopKStringPatterns.java
mahout/trunk/pom.xml
mahout/trunk/src/main/appended-resources/META-INF/NOTICE
mahout/trunk/src/main/appended-resources/supplemental-models.xml
mahout/trunk/taste-web/pom.xml
Modified: mahout/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/pom.xml?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
--- mahout/trunk/core/pom.xml (original)
+++ mahout/trunk/core/pom.xml Wed Mar 30 15:50:20 2011
@@ -148,11 +148,6 @@
</dependency>
<dependency>
- <groupId>org.apache.mahout.hbase</groupId>
- <artifactId>hbase</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
Wed Mar 30 15:50:20 2011
@@ -36,7 +36,6 @@ import org.apache.lucene.util.Version;
import org.apache.mahout.classifier.bayes.algorithm.BayesAlgorithm;
import org.apache.mahout.classifier.bayes.algorithm.CBayesAlgorithm;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
-import org.apache.mahout.classifier.bayes.datastore.HBaseBayesDatastore;
import org.apache.mahout.classifier.bayes.datastore.InMemoryBayesDatastore;
import org.apache.mahout.classifier.bayes.interfaces.Algorithm;
import org.apache.mahout.classifier.bayes.interfaces.Datastore;
@@ -46,7 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Runs the Bayes classifier using the given model location(HDFS/HBASE)
+ * Runs the Bayes classifier using the given model location on HDFS
*
*/
public final class Classify {
@@ -91,7 +90,7 @@ public final class Classify {
Option dataSourceOpt =
obuilder.withLongName("dataSource").withRequired(true).withArgument(
abuilder.withName("dataSource").withMinimum(1).withMaximum(1).create()).withDescription(
- "Location of model: hdfs|hbase").withShortName("source").create();
+ "Location of model: hdfs").withShortName("source").create();
Group options =
gbuilder.withName("Options").withOption(pathOpt).withOption(classifyOpt).withOption(
encodingOpt).withOption(analyzerOpt).withOption(defaultCatOpt).withOption(gramSizeOpt).withOption(
@@ -133,19 +132,6 @@ public final class Classify {
throw new IllegalArgumentException("Unrecognized classifier type: " +
classifierType);
}
- } else if ("hbase".equals(dataSource)) {
- if ("bayes".equalsIgnoreCase(classifierType)) {
- log.info("Using Bayes Classifier");
- algorithm = new BayesAlgorithm();
- datastore = new HBaseBayesDatastore(params);
- } else if ("cbayes".equalsIgnoreCase(classifierType)) {
- log.info("Using Complementary Bayes Classifier");
- algorithm = new CBayesAlgorithm();
- datastore = new HBaseBayesDatastore(params);
- } else {
- throw new IllegalArgumentException("Unrecognized classifier type: " +
classifierType);
- }
-
} else {
throw new IllegalArgumentException("Unrecognized dataSource type: " +
dataSource);
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
Wed Mar 30 15:50:20 2011
@@ -37,7 +37,6 @@ import org.apache.mahout.classifier.Resu
import org.apache.mahout.classifier.bayes.algorithm.BayesAlgorithm;
import org.apache.mahout.classifier.bayes.algorithm.CBayesAlgorithm;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
-import org.apache.mahout.classifier.bayes.datastore.HBaseBayesDatastore;
import org.apache.mahout.classifier.bayes.datastore.InMemoryBayesDatastore;
import org.apache.mahout.classifier.bayes.exceptions.InvalidDatastoreException;
import org.apache.mahout.classifier.bayes.interfaces.Algorithm;
@@ -72,7 +71,7 @@ public final class TestClassifier {
Option pathOpt =
obuilder.withLongName("model").withRequired(true).withArgument(
abuilder.withName("model").withMinimum(1).withMaximum(1).create()).withDescription(
- "The path on HDFS / Name of Hbase Table as defined by the -source
parameter").withShortName("m")
+ "The path on HDFS as defined by the -source
parameter").withShortName("m")
.create();
Option dirOpt =
obuilder.withLongName("testDir").withRequired(true).withArgument(
@@ -106,7 +105,7 @@ public final class TestClassifier {
Option dataSourceOpt =
obuilder.withLongName("dataSource").withRequired(false).withArgument(
abuilder.withName("dataSource").withMinimum(1).withMaximum(1).create()).withDescription(
- "Location of model: hdfs|hbase Default Value:
hdfs").withShortName("source").create();
+ "Location of model: hdfs").withShortName("source").create();
Option methodOpt =
obuilder.withLongName("method").withRequired(false).withArgument(
abuilder.withName("method").withMinimum(1).withMaximum(1).create()).withDescription(
@@ -219,19 +218,6 @@ public final class TestClassifier {
throw new IllegalArgumentException("Unrecognized classifier type: " +
params.get("classifierType"));
}
- } else if (params.get("dataSource").equals("hbase")) {
- if (params.get("classifierType").equalsIgnoreCase("bayes")) {
- log.info("Testing Bayes Classifier");
- algorithm = new BayesAlgorithm();
- datastore = new HBaseBayesDatastore(params);
- } else if (params.get("classifierType").equalsIgnoreCase("cbayes")) {
- log.info("Testing Complementary Bayes Classifier");
- algorithm = new CBayesAlgorithm();
- datastore = new HBaseBayesDatastore(params);
- } else {
- throw new IllegalArgumentException("Unrecognized classifier type: " +
params.get("classifierType"));
- }
-
} else {
throw new IllegalArgumentException("Unrecognized dataSource type: " +
params.get("dataSource"));
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/TrainClassifier.java
Wed Mar 30 15:50:20 2011
@@ -98,7 +98,7 @@ public final class TrainClassifier {
Option dataSourceOpt =
obuilder.withLongName("dataSource").withRequired(false).withArgument(
abuilder.withName("dataSource").withMinimum(1).withMaximum(1).create()).withDescription(
- "Location of model: hdfs|hbase. Default Value:
hdfs").withShortName("source").create();
+ "Location of model: hdfs. Default Value:
hdfs").withShortName("source").create();
Option skipCleanupOpt =
obuilder.withLongName("skipCleanup").withRequired(false).withDescription(
"Skip cleanup of feature extraction
output").withShortName("sc").create();
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/datastore/HBaseBayesDatastore.java
Wed Mar 30 15:50:20 2011
@@ -1,277 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.mahout.classifier.bayes.datastore;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.mahout.classifier.bayes.common.BayesParameters;
-import org.apache.mahout.classifier.bayes.exceptions.InvalidDatastoreException;
-import org.apache.mahout.classifier.bayes.interfaces.Datastore;
-import org.apache.mahout.classifier.bayes.mapreduce.common.BayesConstants;
-import org.apache.mahout.common.Parameters;
-import org.apache.mahout.common.cache.Cache;
-import org.apache.mahout.common.cache.HybridCache;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Class implementing the Datastore for Algorithms to read HBase based model
- *
- */
-public class HBaseBayesDatastore implements Datastore {
-
- private static final Logger log =
LoggerFactory.getLogger(HBaseBayesDatastore.class);
-
- private HBaseConfiguration config;
-
- private HTable table;
-
- private final Cache<String,Result> tableCache;
-
- private final String hbaseTable;
-
- private final Parameters parameters;
-
- private double thetaNormalizer = 1.0;
-
- private double alphaI = 1.0;
-
- private final Map<String,Set<String>> keys = new
HashMap<String,Set<String>>();
-
- private double vocabCount = -1.0;
-
- private double sigmaJSigmaK = -1.0;
-
- public HBaseBayesDatastore(BayesParameters params) {
- this.hbaseTable = params.getBasePath();
- this.parameters = params;
- this.tableCache = new HybridCache<String,Result>(50000, 100000);
- alphaI = Double.valueOf(parameters.get("alpha_i", "1.0"));
- }
-
- protected HBaseConfiguration getConfig() {
- return config;
- }
-
- protected HTable getTable() {
- return table;
- }
-
- protected Cache<String,Result> getTableCache() {
- return tableCache;
- }
-
- protected String getHbaseTable() {
- return hbaseTable;
- }
-
- protected Parameters getParameters() {
- return parameters;
- }
-
- protected double getThetaNormalizer() {
- return thetaNormalizer;
- }
-
- protected double getAlphaI() {
- return alphaI;
- }
-
- Map<String,Set<String>> getKeys() {
- return keys;
- }
-
- protected double getVocabCount() {
- return vocabCount;
- }
-
- protected double getSigmaJSigmaK() {
- return sigmaJSigmaK;
- }
-
- @Override
- public void initialize() throws InvalidDatastoreException {
- config = new HBaseConfiguration(new Configuration());
- try {
- table = new HTable(config, hbaseTable);
- } catch (IOException e) {
- throw new InvalidDatastoreException(e.getMessage());
- }
- Collection<String> labels = getKeys("thetaNormalizer");
- for (String label : labels) {
- thetaNormalizer = Math.max(thetaNormalizer, Math.abs(getWeightFromHbase(
- BayesConstants.LABEL_THETA_NORMALIZER, label)));
- }
- for (String label : labels) {
- log.info("{} {} {} {}", new Object[] {
- label,
- getWeightFromHbase(BayesConstants.LABEL_THETA_NORMALIZER, label),
- thetaNormalizer,
- getWeightFromHbase(BayesConstants.LABEL_THETA_NORMALIZER, label) /
thetaNormalizer
- });
- }
- }
-
- @Override
- public Collection<String> getKeys(String name) throws
InvalidDatastoreException {
- if (keys.containsKey(name)) {
- return keys.get(name);
- }
- Result r;
- if ("labelWeight".equals(name)) {
- r = getRowFromHbase(BayesConstants.LABEL_SUM);
- } else if ("thetaNormalizer".equals(name)) {
- r = getRowFromHbase(BayesConstants.LABEL_THETA_NORMALIZER);
- } else {
- r = getRowFromHbase(name);
- }
-
- if (r == null) {
- log.error("Encountered NULL");
- throw new InvalidDatastoreException("Encountered NULL");
- }
-
- Set<byte[]> labelBytes =
r.getNoVersionMap().get(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY))
- .keySet();
- Set<String> keySet = new HashSet<String>();
- for (byte[] key : labelBytes) {
- keySet.add(Bytes.toString(key));
- }
- keys.put(name, keySet);
- return keySet;
- }
-
- @Override
- public double getWeight(String matrixName, String row, String column) throws
InvalidDatastoreException {
- if ("weight".equals(matrixName)) {
- if ("sigma_j".equals(column)) {
- return getSigmaJFromHbase(row);
- } else {
- return getWeightFromHbase(row, column);
- }
- } else {
- throw new InvalidDatastoreException();
- }
- }
-
- @Override
- public double getWeight(String vectorName, String index) throws
InvalidDatastoreException {
- if ("sumWeight".equals(vectorName)) {
- if ("vocabCount".equals(index)) {
- return getVocabCountFromHbase();
- } else if ("sigma_jSigma_k".equals(index)) {
- return getSigmaJSigmaKFromHbase();
- } else {
- throw new InvalidDatastoreException();
- }
-
- } else if ("labelWeight".equals(vectorName)) {
- return getWeightFromHbase(BayesConstants.LABEL_SUM, index);
- } else if ("thetaNormalizer".equals(vectorName)) {
- return getWeightFromHbase(BayesConstants.LABEL_THETA_NORMALIZER, index)
/ thetaNormalizer;
- } else if ("params".equals(vectorName)) {
- if ("alpha_i".equals(index)) {
- return alphaI;
- } else {
- throw new InvalidDatastoreException();
- }
- } else {
-
- throw new InvalidDatastoreException();
- }
- }
-
- protected double getCachedCell(String row, String family, String column) {
- Result r = tableCache.get(row);
-
- if (r == null) {
- Get g = new Get(Bytes.toBytes(row));
- g.addFamily(Bytes.toBytes(family));
- try {
- r = table.get(g);
- } catch (IOException e) {
- return 0.0;
- }
- tableCache.set(row, r);
- }
- byte[] value =
r.getValue(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(column));
- if (value == null) {
- return 0.0;
- }
- return Bytes.toDouble(value);
-
- }
-
- protected double getWeightFromHbase(String feature, String label) {
- return getCachedCell(feature, BayesConstants.HBASE_COLUMN_FAMILY, label);
- }
-
- protected Result getRowFromHbase(String feature) {
- Result r = tableCache.get(feature);
- try {
- if (r == null) {
- Get g = new Get(Bytes.toBytes(feature));
- g.addFamily(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY));
- r = table.get(g);
- tableCache.set(feature, r);
- return r;
- } else {
- return r;
- }
-
- } catch (IOException e) {
- return r;
- }
- }
-
- protected double getSigmaJFromHbase(String feature) {
- return getCachedCell(feature, BayesConstants.HBASE_COLUMN_FAMILY,
BayesConstants.FEATURE_SUM);
- }
-
- protected double getVocabCountFromHbase() {
- if (vocabCount == -1.0) {
- vocabCount = getCachedCell(BayesConstants.HBASE_COUNTS_ROW,
BayesConstants.HBASE_COLUMN_FAMILY,
- BayesConstants.FEATURE_SET_SIZE);
- return vocabCount;
- } else {
- return vocabCount;
- }
- }
-
- protected double getSigmaJSigmaKFromHbase() {
- if (sigmaJSigmaK == -1.0) {
- sigmaJSigmaK = getCachedCell(BayesConstants.HBASE_COUNTS_ROW,
BayesConstants.HBASE_COLUMN_FAMILY,
- BayesConstants.TOTAL_SUM);
- return sigmaJSigmaK;
- } else {
- return sigmaJSigmaK;
- }
- }
-
-}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Algorithm.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Algorithm.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Algorithm.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/interfaces/Algorithm.java
Wed Mar 30 15:50:20 2011
@@ -41,7 +41,7 @@ public interface Algorithm {
* @param document
* The document to classify
* @param datastore
- * The data store(InMemory, HBase)
+ * The data store(InMemory)
* @param defaultCategory
* The default category to assign Ties are broken by comparing the
category
* @return A Collection of {@link
org.apache.mahout.classifier.ClassifierResult}s.
@@ -57,7 +57,7 @@ public interface Algorithm {
* @param document
* The document to classify
* @param datastore
- * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory, HBase)
+ * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory)
* @param defaultCategory
* The default category to assign
* @param numResults
@@ -75,7 +75,7 @@ public interface Algorithm {
* Get the weighted probability of the feature.
*
* @param datastore
- * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory, HBase)
+ * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory)
* @param label
* The label of the feature
* @param feature
@@ -90,7 +90,7 @@ public interface Algorithm {
* of a particular class
*
* @param datastore
- * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory, HBase)
+ * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory)
* @param label
* The label to calculate the probability of
* @param document
@@ -104,7 +104,7 @@ public interface Algorithm {
* Returns the labels in the given Model
*
* @param datastore
- * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory, HBase)
+ * The {@link
org.apache.mahout.classifier.bayes.interfaces.Datastore} (InMemory)
* @throws InvalidDatastoreException
* @return {@link Collection} of labels
*/
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesClassifierMapper.java
Wed Mar 30 15:50:20 2011
@@ -31,7 +31,6 @@ import org.apache.mahout.classifier.Clas
import org.apache.mahout.classifier.bayes.algorithm.BayesAlgorithm;
import org.apache.mahout.classifier.bayes.algorithm.CBayesAlgorithm;
import org.apache.mahout.classifier.bayes.common.BayesParameters;
-import org.apache.mahout.classifier.bayes.datastore.HBaseBayesDatastore;
import org.apache.mahout.classifier.bayes.datastore.InMemoryBayesDatastore;
import org.apache.mahout.classifier.bayes.exceptions.InvalidDatastoreException;
import org.apache.mahout.classifier.bayes.interfaces.Algorithm;
@@ -115,19 +114,6 @@ public class BayesClassifierMapper exten
throw new IllegalArgumentException("Unrecognized classifier type: "
+ params.get("classifierType"));
}
- } else if (params.get("dataSource").equals("hbase")) {
- if (params.get("classifierType").equalsIgnoreCase("bayes")) {
- log.info("Testing Bayes Classifier");
- algorithm = new BayesAlgorithm();
- datastore = new HBaseBayesDatastore(params);
- } else if (params.get("classifierType").equalsIgnoreCase("cbayes")) {
- log.info("Testing Complementary Bayes Classifier");
- algorithm = new CBayesAlgorithm();
- datastore = new HBaseBayesDatastore(params);
- } else {
- throw new IllegalArgumentException("Unrecognized classifier type: "
+ params.get("classifierType"));
- }
-
} else {
throw new IllegalArgumentException("Unrecognized dataSource type: " +
params.get("dataSource"));
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerReducer.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/bayes/BayesThetaNormalizerReducer.java
Wed Mar 30 15:50:20 2011
@@ -20,43 +20,25 @@ package org.apache.mahout.classifier.bay
import java.io.IOException;
import java.util.Iterator;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.classifier.bayes.mapreduce.common.BayesConstants;
-import org.apache.mahout.common.Parameters;
import org.apache.mahout.common.StringTuple;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Can also be used as a local Combiner beacuse only two values should be
there inside the values
*/
public class BayesThetaNormalizerReducer extends MapReduceBase implements
Reducer<StringTuple,DoubleWritable,StringTuple,DoubleWritable> {
-
- private static final Logger log =
LoggerFactory.getLogger(BayesThetaNormalizerReducer.class);
-
- private HTable table;
-
- private boolean useHbase;
-
+
@Override
public void reduce(StringTuple key,
Iterator<DoubleWritable> values,
OutputCollector<StringTuple,DoubleWritable> output,
Reporter reporter) throws IOException {
- // Key is label,word, value is the number of times we've seen this label
- // word per local node. Output is the same
-
-
+ // Key is label,word, value is the number of times we've seen this label
word per local node. Output is the same
double weightSumPerLabel = 0.0;
while (values.hasNext()) {
@@ -64,38 +46,8 @@ public class BayesThetaNormalizerReducer
weightSumPerLabel += values.next().get();
}
reporter.setStatus("Bayes Theta Normalizer Reducer: " + key + " => " +
weightSumPerLabel);
- if (useHbase &&
key.stringAt(0).equals(BayesConstants.LABEL_THETA_NORMALIZER)) {
- String label = key.stringAt(1);
- Put bu = new Put(Bytes.toBytes(BayesConstants.LABEL_THETA_NORMALIZER));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(label), Bytes.toBytes(weightSumPerLabel));
- table.put(bu);
- }
output.collect(key, new DoubleWritable(weightSumPerLabel));
}
-
- @Override
- public void configure(JobConf job) {
- try {
- Parameters params = new Parameters(job.get("bayes.parameters", ""));
- if (params.get("dataSource").equals("hbase")) {
- useHbase = true;
- } else {
- return;
- }
-
- HBaseConfiguration hBconf = new HBaseConfiguration(job);
- table = new HTable(hBconf, job.get("output.table"));
- } catch (IOException e) {
- log.error("Unexpected error during configuration", e);
- }
- }
-
- @Override
- public void close() throws IOException {
- if (useHbase) {
- table.close();
- }
- super.close();
- }
+
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerReducer.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/cbayes/CBayesThetaNormalizerReducer.java
Wed Mar 30 15:50:20 2011
@@ -20,43 +20,25 @@ package org.apache.mahout.classifier.bay
import java.io.IOException;
import java.util.Iterator;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.classifier.bayes.mapreduce.common.BayesConstants;
-import org.apache.mahout.common.Parameters;
import org.apache.mahout.common.StringTuple;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Can also be used as a local Combiner beacuse only two values should be
there inside the values
*/
public class CBayesThetaNormalizerReducer extends MapReduceBase implements
Reducer<StringTuple,DoubleWritable,StringTuple,DoubleWritable> {
-
- private static final Logger log =
LoggerFactory.getLogger(CBayesThetaNormalizerReducer.class);
- private static final ThreadLocal<HBaseConfiguration> hBconf = new
ThreadLocal<HBaseConfiguration>();
-
- private HTable table;
- private boolean useHbase;
-
@Override
public void reduce(StringTuple key,
Iterator<DoubleWritable> values,
OutputCollector<StringTuple,DoubleWritable> output,
Reporter reporter) throws IOException {
- // Key is label,word, value is the number of times we've seen this label
- // word per local node. Output is the same
-
+ // Key is label,word, value is the number of times we've seen this label
word per local node. Output is the same
double weightSumPerLabel = 0.0;
while (values.hasNext()) {
@@ -64,39 +46,8 @@ public class CBayesThetaNormalizerReduce
weightSumPerLabel += values.next().get();
}
reporter.setStatus("Complementary Bayes Theta Normalizer Reducer: " + key
+ " => " + weightSumPerLabel);
-
- if (useHbase &&
key.stringAt(0).equals(BayesConstants.LABEL_THETA_NORMALIZER)) {
- String label = key.stringAt(1);
- Put bu = new Put(Bytes.toBytes(BayesConstants.LABEL_THETA_NORMALIZER));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(label), Bytes.toBytes(weightSumPerLabel));
- table.put(bu);
- }
output.collect(key, new DoubleWritable(weightSumPerLabel));
}
-
- @Override
- public void configure(JobConf job) {
- try {
- Parameters params = new Parameters(job.get("bayes.parameters", ""));
- if (params.get("dataSource").equals("hbase")) {
- useHbase = true;
- } else {
- return;
- }
-
- hBconf.set(new HBaseConfiguration(job));
- table = new HTable(hBconf.get(), job.get("output.table"));
- } catch (IOException e) {
- log.error("Unexpected error during configuration", e);
- }
- }
-
- @Override
- public void close() throws IOException {
- if (useHbase) {
- table.close();
- }
- super.close();
- }
+
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfDriver.java
Wed Mar 30 15:50:20 2011
@@ -21,13 +21,8 @@ import java.io.IOException;
import java.util.Map;
import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.DefaultStringifier;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.mapred.FileInputFormat;
@@ -81,14 +76,13 @@ public class BayesTfIdfDriver implements
"org.apache.hadoop.io.serializer.JavaSerialization,org.apache.hadoop.io.serializer.WritableSerialization");
// Dont ever forget this. People should keep track of how hadoop conf
// parameters and make or break a piece of code
-
- FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
+
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
HadoopUtil.overwriteOutput(outPath);
Path interimFile = new Path(output, "trainer-docCount/part-*");
- Map<String,Double> labelDocumentCounts =
SequenceFileModelReader.readLabelDocumentCounts(dfs,
- interimFile, conf);
+ Map<String,Double> labelDocumentCounts =
SequenceFileModelReader.readLabelDocumentCounts(dfs, interimFile, conf);
DefaultStringifier<Map<String,Double>> mapStringifier = new
DefaultStringifier<Map<String,Double>>(conf,
GenericsUtil.getClass(labelDocumentCounts));
@@ -100,29 +94,6 @@ public class BayesTfIdfDriver implements
conf.set("cnaivebayes.labelDocumentCounts", labelDocumentCountString);
log.info(params.print());
- if (params.get("dataSource").equals("hbase")) {
- String tableName = output.toString();
- HBaseConfiguration hc = new HBaseConfiguration(new Configuration());
- HTableDescriptor ht = new HTableDescriptor(tableName);
- HColumnDescriptor hcd = new
HColumnDescriptor(BayesConstants.HBASE_COLUMN_FAMILY + ':');
- hcd.setBloomfilter(true);
- hcd.setInMemory(true);
- hcd.setMaxVersions(1);
- hcd.setBlockCacheEnabled(true);
- ht.addFamily(hcd);
-
- log.info("Connecting to hbase...");
- HBaseAdmin hba = new HBaseAdmin(hc);
- log.info("Creating Table {}", output);
-
- if (hba.tableExists(tableName)) {
- hba.disableTable(tableName);
- hba.deleteTable(tableName);
- hba.majorCompact(".META.");
- }
- hba.createTable(ht);
- conf.set("output.table", tableName);
- }
conf.set("bayes.parameters", params.toString());
client.setConf(conf);
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfReducer.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesTfIdfReducer.java
Wed Mar 30 15:50:20 2011
@@ -20,17 +20,11 @@ package org.apache.mahout.classifier.bay
import java.io.IOException;
import java.util.Iterator;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.common.Parameters;
import org.apache.mahout.common.StringTuple;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,17 +37,12 @@ public class BayesTfIdfReducer extends M
private static final Logger log =
LoggerFactory.getLogger(BayesTfIdfReducer.class);
- private HTable table;
-
- private boolean useHbase;
-
@Override
public void reduce(StringTuple key,
Iterator<DoubleWritable> values,
OutputCollector<StringTuple,DoubleWritable> output,
Reporter reporter) throws IOException {
- // Key is label,word, value is the number of times we've seen this label
- // word per local node. Output is the same
+ // Key is label,word, value is the number of times we've seen this label
word per local node. Output is the same
if (key.stringAt(0).equals(BayesConstants.FEATURE_SET_SIZE)) {
double vocabCount = 0.0;
@@ -64,30 +53,11 @@ public class BayesTfIdfReducer extends M
}
log.info("{}\t{}", key, vocabCount);
- if (useHbase) {
- Put bu = new Put(Bytes.toBytes(BayesConstants.HBASE_COUNTS_ROW));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY), Bytes
- .toBytes(BayesConstants.FEATURE_SET_SIZE),
Bytes.toBytes(vocabCount));
- table.put(bu);
- }
output.collect(key, new DoubleWritable(vocabCount));
} else if (key.stringAt(0).equals(BayesConstants.WEIGHT)) {
double idfTimesDIJ = 1.0;
- int numberofValues = 0;
while (values.hasNext()) {
idfTimesDIJ *= values.next().get();
- numberofValues++;
- }
- if (numberofValues == 2) { // Found TFIdf
- String label = key.stringAt(1);
- String feature = key.stringAt(2);
- if (useHbase) {
- Put bu = new Put(Bytes.toBytes(feature));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(label), Bytes
- .toBytes(idfTimesDIJ));
- table.put(bu);
- }
-
}
reporter.setStatus("Bayes TfIdf Reducer: " + key + " => " + idfTimesDIJ);
output.collect(key, new DoubleWritable(idfTimesDIJ));
@@ -95,32 +65,5 @@ public class BayesTfIdfReducer extends M
throw new IllegalArgumentException("Unexpected StringTuple: " + key);
}
}
-
- @Override
- public void configure(JobConf job) {
- try {
- Parameters params = new Parameters(job.get("bayes.parameters", ""));
- if (params.get("dataSource").equals("hbase")) {
- useHbase = true;
- } else {
- return;
- }
-
- HBaseConfiguration hBconf = new HBaseConfiguration(job);
-
- table = new HTable(hBconf, job.get("output.table"));
-
- } catch (IOException e) {
- log.error("Unexpected error during configuration", e);
- }
-
- }
-
- @Override
- public void close() throws IOException {
- if (useHbase) {
- table.close();
- }
- super.close();
- }
+
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerReducer.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerReducer.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerReducer.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/mapreduce/common/BayesWeightSummerReducer.java
Wed Mar 30 15:50:20 2011
@@ -20,17 +20,11 @@ package org.apache.mahout.classifier.bay
import java.io.IOException;
import java.util.Iterator;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.DoubleWritable;
-import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MapReduceBase;
import org.apache.hadoop.mapred.OutputCollector;
import org.apache.hadoop.mapred.Reducer;
import org.apache.hadoop.mapred.Reporter;
-import org.apache.mahout.common.Parameters;
import org.apache.mahout.common.StringTuple;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,10 +35,6 @@ public class BayesWeightSummerReducer ex
private static final Logger log =
LoggerFactory.getLogger(BayesWeightSummerReducer.class);
- private HTable table;
-
- private boolean useHbase;
-
@Override
public void reduce(StringTuple key,
Iterator<DoubleWritable> values,
@@ -59,58 +49,8 @@ public class BayesWeightSummerReducer ex
sum += values.next().get();
}
reporter.setStatus("Bayes Weight Summer Reducer: " + key + " => " + sum);
- if (useHbase) {
- if (key.stringAt(0).equals(BayesConstants.FEATURE_SUM)) { // sum of
weight
- // for all
- // labels for a
- // feature
- // Sigma_j
- String feature = key.stringAt(1);
-
- Put bu = new Put(Bytes.toBytes(feature));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(BayesConstants.FEATURE_SUM),
- Bytes.toBytes(sum));
- table.put(bu);
-
- } else if (key.stringAt(0).equals(BayesConstants.LABEL_SUM)) {
- String label = key.stringAt(1);
- Put bu = new Put(Bytes.toBytes(BayesConstants.LABEL_SUM));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(label), Bytes.toBytes(sum));
- table.put(bu);
- } else if (key.stringAt(0).equals(BayesConstants.TOTAL_SUM)) {
- Put bu = new Put(Bytes.toBytes(BayesConstants.HBASE_COUNTS_ROW));
- bu.add(Bytes.toBytes(BayesConstants.HBASE_COLUMN_FAMILY),
Bytes.toBytes(BayesConstants.TOTAL_SUM),
- Bytes.toBytes(sum));
- table.put(bu);
- }
- }
output.collect(key, new DoubleWritable(sum));
}
-
- @Override
- public void configure(JobConf job) {
- try {
- Parameters params = new Parameters(job.get("bayes.parameters", ""));
- if (params.get("dataSource").equals("hbase")) {
- useHbase = true;
- } else {
- return;
- }
-
- HBaseConfiguration hBconf = new HBaseConfiguration(job);
- table = new HTable(hBconf, job.get("output.table"));
- } catch (IOException e) {
- log.error("Unexpected error during configuration", e);
- }
-
- }
-
- @Override
- public void close() throws IOException {
- if (useHbase) {
- table.close();
- }
- super.close();
- }
+
}
Modified:
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/string/TopKStringPatterns.java
URL:
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/string/TopKStringPatterns.java?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
---
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/string/TopKStringPatterns.java
(original)
+++
mahout/trunk/core/src/main/java/org/apache/mahout/fpm/pfpgrowth/convertors/string/TopKStringPatterns.java
Wed Mar 30 15:50:20 2011
@@ -25,9 +25,9 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.io.Writable;
import org.apache.mahout.common.Pair;
+import com.google.common.base.Charsets;
/**
* A class which collects Top K string patterns
@@ -115,7 +115,7 @@ public final class TopKStringPatterns im
int itemLength = in.readInt();
byte[] data = new byte[itemLength];
in.readFully(data);
- items.add(Bytes.toString(data));
+ items.add(new String(data, Charsets.UTF_8));
}
frequentPatterns.add(new Pair<List<String>,Long>(items, support));
}
@@ -128,7 +128,7 @@ public final class TopKStringPatterns im
out.writeInt(pattern.getFirst().size());
out.writeLong(pattern.getSecond());
for (String item : pattern.getFirst()) {
- byte[] data = Bytes.toBytes(item);
+ byte[] data = item.getBytes(Charsets.UTF_8);
out.writeInt(data.length);
out.write(data);
}
Modified: mahout/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/pom.xml?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
--- mahout/trunk/pom.xml (original)
+++ mahout/trunk/pom.xml Wed Mar 30 15:50:20 2011
@@ -299,13 +299,6 @@
<artifactId>gson</artifactId>
<version>1.3</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.mahout.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>0.20.0</version>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
Modified: mahout/trunk/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/mahout/trunk/src/main/appended-resources/META-INF/NOTICE?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
--- mahout/trunk/src/main/appended-resources/META-INF/NOTICE (original)
+++ mahout/trunk/src/main/appended-resources/META-INF/NOTICE Wed Mar 30
15:50:20 2011
@@ -20,10 +20,6 @@ This product includes examples code from
https://watchmaker.dev.java.net/
Copyright (c) 2006-2009 Daniel W. Dyer.
-This product includes libraries developed by the Kosmos project
(http://kosmosfs.sourceforge.net/)
- Copyright 2008 Quantcast Corp.
- Copyright 2007 Kosmix Corp.
-
This product includes software developed by the Jets3T project
(https://jets3t.dev.java.net/)
Copyright (c) 2008 James Murty
Modified: mahout/trunk/src/main/appended-resources/supplemental-models.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/src/main/appended-resources/supplemental-models.xml?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
--- mahout/trunk/src/main/appended-resources/supplemental-models.xml (original)
+++ mahout/trunk/src/main/appended-resources/supplemental-models.xml Wed Mar 30
15:50:20 2011
@@ -280,25 +280,6 @@
</licenses>
</project>
</supplement>
- <!-- Apache Hadoop Hbase -->
- <supplement>
- <project>
- <groupId>org.apache.mahout.hbase</groupId>
- <artifactId>hbase</artifactId>
- <name>Apache Hadoop</name>
- <url>http://hadoop.apache.org/hbase/</url>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
- </project>
- </supplement>
<!-- jets3d -->
<supplement>
<project>
@@ -314,21 +295,6 @@
</licenses>
</project>
</supplement>
- <!-- kosmofs -->
- <supplement>
- <project>
- <name>KFS</name>
- <groupId>org.apache.mahout.kosmofs</groupId>
- <artifactId>kfs</artifactId>
- <url>http://kosmosfs.sourceforge.net/index.html</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
- </project>
- </supplement>
<!-- uncommons math -->
<supplement>
<project>
Modified: mahout/trunk/taste-web/pom.xml
URL:
http://svn.apache.org/viewvc/mahout/trunk/taste-web/pom.xml?rev=1086994&r1=1086993&r2=1086994&view=diff
==============================================================================
--- mahout/trunk/taste-web/pom.xml (original)
+++ mahout/trunk/taste-web/pom.xml Wed Mar 30 15:50:20 2011
@@ -120,18 +120,10 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.mahout.hbase</groupId>
- <artifactId>hbase</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.mahout.kosmofs</groupId>
- <artifactId>kfs</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.mahout.jets3t</groupId>
<artifactId>jets3t</artifactId>
</exclusion>
