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 2011/04/15 15:33:04 UTC
svn commit: r1092702 - in
/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd:
hadoop/DatasetSplit.java tool/CDInfosTool.java tool/ToolCombiner.java
tool/ToolMapper.java tool/ToolReducer.java
Author: srowen
Date: Fri Apr 15 13:33:04 2011
New Revision: 1092702
URL: http://svn.apache.org/viewvc?rev=1092702&view=rev
Log:
First step on MAHOUT-664, remove redundant use of Xstream
Modified:
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java
mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java?rev=1092702&r1=1092701&r2=1092702&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/hadoop/DatasetSplit.java Fri Apr 15 13:33:04 2011
@@ -88,7 +88,7 @@ public final class DatasetSplit {
}
public void storeJobParameters(Configuration conf) {
- conf.set(SEED, StringUtils.toString(seed));
+ conf.set(SEED, String.valueOf(seed));
conf.set(THRESHOLD, Double.toString(threshold));
conf.setBoolean(TRAINING, training);
}
@@ -96,7 +96,7 @@ public final class DatasetSplit {
static long getSeed(Configuration conf) {
String seedstr = conf.get(SEED);
Preconditions.checkArgument(seedstr != null, "Job parameter %s not found", SEED);
- return StringUtils.<Long> fromString(seedstr);
+ return Long.parseLong(seedstr);
}
static double getThreshold(Configuration conf) {
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java?rev=1092702&r1=1092701&r2=1092702&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/CDInfosTool.java Fri Apr 15 13:33:04 2011
@@ -114,7 +114,7 @@ public final class CDInfosTool {
job.setOutputFormatClass(SequenceFileOutputFormat.class);
// store the stringified descriptors
- job.getConfiguration().set(ToolMapper.ATTRIBUTES, StringUtils.toString(descriptors.getChars()));
+ job.getConfiguration().set(ToolMapper.ATTRIBUTES, new String(descriptors.getChars()));
}
/**
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java?rev=1092702&r1=1092701&r2=1092702&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolCombiner.java Fri Apr 15 13:33:04 2011
@@ -56,7 +56,7 @@ public class ToolCombiner extends Reduce
String descriptors = context.getConfiguration().get(ToolMapper.ATTRIBUTES);
if (descriptors != null) {
- configure(StringUtils.<char[]> fromString(descriptors));
+ configure(descriptors.toCharArray());
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java?rev=1092702&r1=1092701&r2=1092702&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolMapper.java Fri Apr 15 13:33:04 2011
@@ -72,10 +72,10 @@ public class ToolMapper extends Mapper<L
@Override
protected void setup(Context context) throws IOException, InterruptedException {
super.setup(context);
- String descrs = context.getConfiguration().get(ATTRIBUTES);
+ String descriptors = context.getConfiguration().get(ATTRIBUTES);
- if (descrs != null) {
- configure(StringUtils.<char[]> fromString(descrs));
+ if (descriptors != null) {
+ configure(descriptors.toCharArray());
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java?rev=1092702&r1=1092701&r2=1092702&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/cd/tool/ToolReducer.java Fri Apr 15 13:33:04 2011
@@ -56,7 +56,7 @@ public class ToolReducer extends Reducer
String descriptors = context.getConfiguration().get(ToolMapper.ATTRIBUTES);
if (descriptors != null) {
- configure(StringUtils.<char[]> fromString(descriptors));
+ configure(descriptors.toCharArray());
}
}