Author: jeastman
Date: Thu Apr 16 21:32:11 2009
New Revision: 765769
URL: http://svn.apache.org/viewvc?rev=765769&view=rev
Log:
MAHOUT-118 fixes all of the occurrences (except one) of FileSystem.get to use
the two argument version with an appropriate Path as a first argument.
The only remaining instance is in
org.apache.mahout.ga.watchmaker.MahoutEvaluator at line 64, where there's no
obvious Path available to provide the first argument. Getting this one working
will probably require refactoring.
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.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/clustering/fuzzykmeans/FuzzyKMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
lucene/mahout/trunk/taste-web/ (props changed)
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderJob.java
Thu Apr 16 21:32:11 2009
@@ -80,7 +80,7 @@
JobConf jobConf = new JobConf(RecommenderJob.class);
- FileSystem fs = FileSystem.get(jobConf);
+ FileSystem fs = FileSystem.get(outputPathPath.toUri(), jobConf);
if (fs.exists(outputPathPath)) {
fs.delete(outputPathPath, true);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/RecommenderMapper.java
Thu Apr 16 21:32:11 2009
@@ -82,10 +82,11 @@
String recommenderClassName = jobConf.get(RECOMMENDER_CLASS_NAME);
FileDataModel fileDataModel;
try {
- FileSystem fs = FileSystem.get(jobConf);
+ Path dataModelPath = new Path(dataModelFile);
+ FileSystem fs = FileSystem.get(dataModelPath.toUri(), jobConf);
File tempDataFile = File.createTempFile("mahout-taste-hadoop", "txt");
tempDataFile.deleteOnExit();
- fs.copyToLocalFile(new Path(dataModelFile), new
Path(tempDataFile.getAbsolutePath()));
+ fs.copyToLocalFile(dataModelPath, new
Path(tempDataFile.getAbsolutePath()));
fileDataModel = new FileDataModel(tempDataFile);
} catch (IOException ioe) {
throw new RuntimeException(ioe);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOneDiffsToAveragesJob.java
Thu Apr 16 21:32:11 2009
@@ -51,7 +51,7 @@
JobConf jobConf = new JobConf(SlopeOnePrefsToDiffsJob.class);
- FileSystem fs = FileSystem.get(jobConf);
+ FileSystem fs = FileSystem.get(outputPathPath.toUri(), jobConf);
if (fs.exists(outputPathPath)) {
fs.delete(outputPathPath, true);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/cf/taste/hadoop/SlopeOnePrefsToDiffsJob.java
Thu Apr 16 21:32:11 2009
@@ -52,7 +52,7 @@
JobConf jobConf = new JobConf(SlopeOnePrefsToDiffsJob.class);
- FileSystem fs = FileSystem.get(jobConf);
+ FileSystem fs = FileSystem.get(outputPathPath.toUri(), jobConf);
if (fs.exists(outputPathPath)) {
fs.delete(outputPathPath, true);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/Classify.java
Thu Apr 16 21:32:11 2009
@@ -106,7 +106,7 @@
modelPaths.put("thetaNormalizer", new Path(modelBasePath +
"/trainer-thetaNormalizer/part-*"));
modelPaths.put("weight", new Path(modelBasePath +
"/trainer-tfIdf/trainer-tfIdf/part-*"));
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get((new Path(modelBasePath)).toUri(), conf);
log.info("Loading model from: {}", modelPaths);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesDriver.java
Thu Apr 16 21:32:11 2009
@@ -65,8 +65,8 @@
*/
public static void runJob(String input, String output, int gramSize) throws
IOException {
JobConf conf = new JobConf(BayesDriver.class);
- FileSystem dfs = FileSystem.get(conf);
Path outPath = new Path(output);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/BayesThetaNormalizerDriver.java
Thu Apr 16 21:32:11 2009
@@ -89,7 +89,7 @@
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesFeatureDriver.java
Thu Apr 16 21:32:11 2009
@@ -86,7 +86,7 @@
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesTfIdfDriver.java
Thu Apr 16 21:32:11 2009
@@ -91,7 +91,7 @@
conf.set("io.serializations",
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/bayes/common/BayesWeightSummerDriver.java
Thu Apr 16 21:32:11 2009
@@ -77,7 +77,7 @@
conf.setCombinerClass(BayesWeightSummerReducer.class);
conf.setReducerClass(BayesWeightSummerReducer.class);
conf.setOutputFormat(BayesWeightSummerOutputFormat.class);
- FileSystem dfs = FileSystem.get(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
client.setConf(conf);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesDriver.java
Thu Apr 16 21:32:11 2009
@@ -65,8 +65,8 @@
*/
public static void runJob(String input, String output, int gramSize) throws
IOException {
JobConf conf = new JobConf(CBayesDriver.class);
- FileSystem dfs = FileSystem.get(conf);
Path outPath = new Path(output);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesNormalizedWeightDriver.java
Thu Apr 16 21:32:11 2009
@@ -89,7 +89,7 @@
conf.set("io.serializations",
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaDriver.java
Thu Apr 16 21:32:11 2009
@@ -91,7 +91,7 @@
conf.set("io.serializations",
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/cbayes/CBayesThetaNormalizerDriver.java
Thu Apr 16 21:32:11 2009
@@ -90,7 +90,7 @@
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/CanopyDriver.java
Thu Apr 16 21:32:11 2009
@@ -74,7 +74,7 @@
conf.setOutputFormat(SequenceFileOutputFormat.class);
client.setConf(conf);
- FileSystem dfs = FileSystem.get(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
JobClient.runJob(conf);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterDriver.java
Thu Apr 16 21:32:11 2009
@@ -75,7 +75,7 @@
conf.setReducerClass(IdentityReducer.class);
client.setConf(conf);
- FileSystem dfs = FileSystem.get(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
JobClient.runJob(conf);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/canopy/ClusterMapper.java
Thu Apr 16 21:32:11 2009
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.slf4j.LoggerFactory;
public class ClusterMapper extends MapReduceBase implements
Mapper<WritableComparable<?>, Text, Text, Text> {
@@ -64,8 +65,8 @@
canopies = new ArrayList<Canopy>();
try {
- FileSystem fs = FileSystem.get(job);
Path path = new Path(canopyPath + "/part-00000");
+ FileSystem fs = FileSystem.get(path.toUri(), job);
SequenceFile.Reader reader = new SequenceFile.Reader(fs, path, job);
try {
Text key = new Text();
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletDriver.java
Thu Apr 16 21:32:11 2009
@@ -104,8 +104,9 @@
IllegalAccessException, FileNotFoundException, IOException {
DirichletState<Vector> state = createState(modelFactory, numModels,
alpha_0);
JobConf job = new JobConf(KMeansDriver.class);
- FileSystem fs = FileSystem.get(job);
- fs.delete(new Path(output), true);
+ Path outPath = new Path(output);
+ FileSystem fs = FileSystem.get(outPath.toUri(), job);
+ fs.delete(outPath, true);
for (int i = 0; i < numModels; i++) {
Path path = new Path(stateIn + "/part-" + i);
SequenceFile.Writer writer = new SequenceFile.Writer(fs, job, path,
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/dirichlet/DirichletJob.java
Thu Apr 16 21:32:11 2009
@@ -60,7 +60,7 @@
// delete the output directory
JobConf conf = new JobConf(DirichletJob.class);
Path outPath = new Path(output);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(outPath.toUri(), conf);
if (fs.exists(outPath)) {
fs.delete(outPath, true);
}
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=765769&r1=765768&r2=765769&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
Thu Apr 16 21:32:11 2009
@@ -70,8 +70,8 @@
try {
DirichletState<Vector> state = DirichletDriver.createState(modelFactory,
new Integer(numClusters), new Double(alpha_0));
- FileSystem fs = FileSystem.get(job);
Path path = new Path(statePath);
+ FileSystem fs = FileSystem.get(path.toUri(), job);
FileStatus[] status = fs.listStatus(path);
for (FileStatus s : status) {
SequenceFile.Reader reader = new SequenceFile.Reader(fs, s.getPath(),
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/fuzzykmeans/FuzzyKMeansDriver.java
Thu Apr 16 21:32:11 2009
@@ -165,7 +165,7 @@
try {
JobClient.runJob(conf);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(outPath.toUri(), conf);
return isConverged(clustersOut, conf, fs);
} catch (IOException e) {
log.warn(e.toString(), e);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansDriver.java
Thu Apr 16 21:32:11 2009
@@ -120,7 +120,7 @@
client.setConf(conf);
try {
JobClient.runJob(conf);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(outPath.toUri(), conf);
return isConverged(clustersOut + "/part-00000", conf, fs);
} catch (IOException e) {
log.warn(e.toString(), e);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansJob.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansJob.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansJob.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/kmeans/KMeansJob.java
Thu Apr 16 21:32:11 2009
@@ -68,7 +68,7 @@
// delete the output directory
JobConf conf = new JobConf(KMeansJob.class);
Path outPath = new Path(output);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(outPath.toUri(), conf);
if (fs.exists(outPath)) {
fs.delete(outPath, true);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/clustering/meanshift/MeanShiftCanopyJob.java
Thu Apr 16 21:32:11 2009
@@ -63,7 +63,7 @@
// delete the output directory
JobConf conf = new JobConf(MeanShiftCanopyDriver.class);
Path outPath = new Path(output);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(outPath.toUri(), conf);
if (fs.exists(outPath)) {
fs.delete(outPath, true);
}
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/MahoutEvaluator.java
Thu Apr 16 21:32:11 2009
@@ -61,10 +61,10 @@
List<Double> evaluations) throws IOException {
JobConf conf = new JobConf(MahoutEvaluator.class);
FileSystem fs = FileSystem.get(conf);
-
Path inpath = prepareInput(fs, population);
Path outpath = OutputUtils.prepareOutput(fs);
+
configureJob(conf, evaluator, inpath, outpath);
JobClient.runJob(conf);
Modified:
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
(original)
+++
lucene/mahout/trunk/core/src/main/java/org/apache/mahout/utils/WeightedDistanceMeasure.java
Thu Apr 16 21:32:11 2009
@@ -63,7 +63,7 @@
ParameteredGeneralizations.configureParameters(this, jobConf);
}
try {
- FileSystem fs = FileSystem.get(jobConf);
+ FileSystem fs = FileSystem.get(weightsFile.get().toUri(), jobConf);
if (weightsFile.get() != null) {
Vector weights = (Vector) vectorClass.get().newInstance();
if (!fs.exists(weightsFile.get())) {
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/canopy/TestCanopyCreation.java
Thu Apr 16 21:32:11 2009
@@ -478,8 +478,8 @@
// verify output from sequence file
JobConf job = new JobConf(
org.apache.mahout.clustering.canopy.CanopyDriver.class);
- FileSystem fs = FileSystem.get(job);
Path path = new Path("output/canopies/part-00000");
+ FileSystem fs = FileSystem.get(path.toUri(), job);
SequenceFile.Reader reader = new SequenceFile.Reader(fs, path, job);
Text key = new Text();
Text value = new Text();
@@ -514,8 +514,8 @@
// verify output from sequence file
JobConf job = new JobConf(
org.apache.mahout.clustering.canopy.CanopyDriver.class);
- FileSystem fs = FileSystem.get(job);
Path path = new Path("output/canopies/part-00000");
+ FileSystem fs = FileSystem.get(path.toUri(), job);
SequenceFile.Reader reader = new SequenceFile.Reader(fs, path, job);
Text key = new Text();
Text value = new Text();
@@ -805,8 +805,8 @@
// verify output from sequence file
JobConf job = new JobConf(
org.apache.mahout.clustering.canopy.CanopyDriver.class);
- FileSystem fs = FileSystem.get(job);
Path path = new Path("output/canopies/part-00000");
+ FileSystem fs = FileSystem.get(path.toUri(), job);
SequenceFile.Reader reader = new SequenceFile.Reader(fs, path, job);
Text key = new Text();
Text value = new Text();
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/fuzzykmeans/TestFuzzyKmeansClustering.java
Thu Apr 16 21:32:11 2009
@@ -210,8 +210,8 @@
System.out.println("testKFuzzyKMeansMRJob k= " + k);
// pick k initial cluster centers at random
JobConf job = new JobConf(FuzzyKMeansDriver.class);
- FileSystem fs = FileSystem.get(job);
Path path = new Path("testdata/clusters");
+ FileSystem fs = FileSystem.get(path.toUri(), job);
if (fs.exists(path)) {
fs.delete(path, true);
}
@@ -239,7 +239,7 @@
JobConf conf = new JobConf(FuzzyKMeansDriver.class);
Path outPath = new Path("output");
- fs = FileSystem.get(conf);
+ fs = FileSystem.get(outPath.toUri(), conf);
if (fs.exists(outPath)) {
fs.delete(outPath, true);
}
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/kmeans/TestKmeansClustering.java
Thu Apr 16 21:32:11 2009
@@ -389,8 +389,8 @@
System.out.println("testKMeansMRJob k= " + k);
// pick k initial cluster centers at random
JobConf job = new JobConf(KMeansDriver.class);
- FileSystem fs = FileSystem.get(job);
Path path = new Path("testdata/clusters/part-00000");
+ FileSystem fs = FileSystem.get(path.toUri(), job);
SequenceFile.Writer writer = new SequenceFile.Writer(fs, job, path,
Text.class, Text.class);
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/clustering/meanshift/TestMeanShift.java
Thu Apr 16 21:32:11 2009
@@ -336,8 +336,8 @@
MeanShiftCanopyJob.runJob("testdata", "output",
EuclideanDistanceMeasure.class.getName(), 4, 1, 0.5, 10);
JobConf conf = new JobConf(MeanShiftCanopyDriver.class);
- FileSystem fs = FileSystem.get(conf);
Path outPart = new Path("output/canopies-2/part-00000");
+ FileSystem fs = FileSystem.get(outPart.toUri(), conf);
SequenceFile.Reader reader = new SequenceFile.Reader(fs, outPart, conf);
Text key = new Text();
Text value = new Text();
Modified:
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
(original)
+++
lucene/mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/MahoutEvaluatorTest.java
Thu Apr 16 21:32:11 2009
@@ -68,8 +68,8 @@
private static void storeLoadPopulation(List<DummyCandidate> population)
throws IOException {
- FileSystem fs = FileSystem.get(new Configuration());
Path f = new Path("build/test.txt");
+ FileSystem fs = FileSystem.get(f.toUri(), new Configuration());
// store the population
MahoutEvaluator.storePopulation(fs, f, population);
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/TestClassifier.java
Thu Apr 16 21:32:11 2009
@@ -107,7 +107,7 @@
modelPaths.put("thetaNormalizer", new Path(modelBasePath +
"/trainer-thetaNormalizer/part-*"));
modelPaths.put("weight", new Path(modelBasePath +
"/trainer-tfIdf/trainer-tfIdf/part-*"));
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get((new Path(modelBasePath)).toUri(), conf);
log.info("Loading model from: {}", modelPaths);
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/bayes/WikipediaDatasetCreatorDriver.java
Thu Apr 16 21:32:11 2009
@@ -88,7 +88,7 @@
"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(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/canopy/Job.java
Thu Apr 16 21:32:11 2009
@@ -66,7 +66,7 @@
Path outPath = new Path(output);
client.setConf(conf);
- FileSystem dfs = FileSystem.get(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
InputDriver.runJob(input, output + "/data");
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/dirichlet/Job.java
Thu Apr 16 21:32:11 2009
@@ -79,7 +79,7 @@
// delete the output directory
JobConf conf = new JobConf(DirichletJob.class);
Path outPath = new Path(output);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(outPath.toUri(), conf);
if (fs.exists(outPath)) {
fs.delete(outPath, true);
}
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/kmeans/Job.java
Thu Apr 16 21:32:11 2009
@@ -26,6 +26,8 @@
import org.apache.mahout.clustering.syntheticcontrol.canopy.InputDriver;
import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Job {
private Job() {
@@ -73,7 +75,7 @@
Path outPath = new Path(output);
client.setConf(conf);
- FileSystem dfs = FileSystem.get(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
InputDriver.runJob(input, output + "/data");
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/syntheticcontrol/meanshift/Job.java
Thu Apr 16 21:32:11 2009
@@ -73,7 +73,7 @@
Path outPath = new Path(output);
client.setConf(conf);
- FileSystem dfs = FileSystem.get(conf);
+ FileSystem dfs = FileSystem.get(outPath.toUri(), conf);
if (dfs.exists(outPath))
dfs.delete(outPath, true);
InputDriver.runJob(input, output + "/data");
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/CDMahoutEvaluator.java
Thu Apr 16 21:32:11 2009
@@ -66,7 +66,7 @@
Path inpath, List<CDFitness> evaluations, DatasetSplit split)
throws IOException {
JobConf conf = new JobConf(CDMahoutEvaluator.class);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(inpath.toUri(), conf);
// check the input
if (!fs.exists(inpath) || !fs.getFileStatus(inpath).isDir())
@@ -88,7 +88,7 @@
*/
public static void initializeDataSet(Path inpath) throws IOException {
JobConf conf = new JobConf(CDMahoutEvaluator.class);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(inpath.toUri(), conf);
// Initialize the dataset
DataSet.initialize(FileInfoParser.parseFile(fs, inpath));
Modified:
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
(original)
+++
lucene/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
Thu Apr 16 21:32:11 2009
@@ -68,7 +68,7 @@
public static void gatherInfos(Descriptors descriptors, Path inpath,
List<String> descriptions) throws IOException {
JobConf conf = new JobConf(CDInfosTool.class);
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = FileSystem.get(inpath.toUri(), conf);
// check the input
if (!fs.exists(inpath) || !fs.getFileStatus(inpath).isDir())
@@ -211,8 +211,8 @@
throw new IllegalArgumentException();
}
- FileSystem fs = FileSystem.get(new Configuration());
Path inpath = new Path(args[0]);
+ FileSystem fs = FileSystem.get(inpath.toUri(), new Configuration());
log.info("Loading Descriptors...");
Descriptors descriptors = loadDescriptors(fs, inpath);
Modified:
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
(original)
+++
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/DataLineTest.java
Thu Apr 16 21:32:11 2009
@@ -31,8 +31,8 @@
"852781,M,18.61,20.25,122.1,1094,0.0944,0.1066,0.149,0.07731,0.1697,0.05699,0.8529,1.849,5.632,93.54,0.01075,0.02722,0.05081,0.01911,0.02293,0.004217,21.31,27.26,139.9,1403,0.1338,0.2117,0.3446,0.149,0.2341,0.07421"
};
public void testSet() throws Exception {
- FileSystem fs = FileSystem.get(new Configuration());
Path inpath = new Path("target/test-classes/wdbc");
+ FileSystem fs = FileSystem.get(inpath.toUri(), new Configuration());
DataSet dataset = FileInfoParser.parseFile(fs, inpath);
DataSet.initialize(dataset);
Modified:
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
(original)
+++
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/FileInfosDatasetTest.java
Thu Apr 16 21:32:11 2009
@@ -31,8 +31,8 @@
public class FileInfosDatasetTest extends TestCase {
public void testRanges() throws IOException {
- FileSystem fs = FileSystem.get(new Configuration());
Path inpath = new Path("target/test-classes/wdbc");
+ FileSystem fs = FileSystem.get(inpath.toUri(), new Configuration());
DataSet dataset = FileInfoParser.parseFile(fs, inpath);
DataSet.initialize(dataset);
Modified:
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
URL:
http://svn.apache.org/viewvc/lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java?rev=765769&r1=765768&r2=765769&view=diff
==============================================================================
---
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
(original)
+++
lucene/mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosToolTest.java
Thu Apr 16 21:32:11 2009
@@ -164,8 +164,8 @@
Object[][] descriptions = randomDescriptions(descriptors);
// random dataset
- FileSystem fs = FileSystem.get(new Configuration());
Path inpath = new Path("input");
+ FileSystem fs = FileSystem.get(inpath.toUri(), new Configuration());
if (fs.exists(inpath)) {
fs.delete(inpath, true);
}
Propchange: lucene/mahout/trunk/taste-web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 16 21:32:11 2009
@@ -1,2 +1,7 @@
target
*.iml
+.externalToolBuilders
+.settings
+.classpath
+.project
+maven-eclipse.xml
