svn commit: r1337698 - in /mahout/trunk: core/src/main/java/org/apache/mahout/classifier/df/ core/src/main/java/org/apache/mahout/ga/watchmaker/ core/src/test/java/org/apache/mahout/ga/watchmaker/ examples/src/main/java/org/apache/mahout/ga/watchmaker/...

[ss...@apache.org]

Author: ssc
Date: Sat May 12 21:50:01 2012
New Revision: 1337698

URL: http://svn.apache.org/viewvc?rev=1337698&view=rev
Log:
MAHOUT-1012 Remove watchmaker from codebase

Removed:
    mahout/trunk/core/src/main/java/org/apache/mahout/ga/watchmaker/
    mahout/trunk/core/src/test/java/org/apache/mahout/ga/watchmaker/
    mahout/trunk/examples/src/main/java/org/apache/mahout/ga/watchmaker/
    mahout/trunk/examples/src/test/java/org/apache/mahout/ga/watchmaker/cd/
Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/DFUtils.java

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/DFUtils.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/DFUtils.java?rev=1337698&r1=1337697&r2=1337698&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/DFUtils.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/DFUtils.java Sat May 12 21:50:01 2012
@@ -17,18 +17,21 @@
 
 package org.apache.mahout.classifier.df;
 
+import com.google.common.collect.Lists;
 import com.google.common.io.Closeables;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Writable;
 import org.apache.mahout.classifier.df.node.Node;
-import org.apache.mahout.ga.watchmaker.OutputUtils;
+import org.apache.mahout.common.iterator.sequencefile.PathFilters;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Utility class that contains various helper methods
@@ -116,14 +119,18 @@ public final class DFUtils {
    * @throws IOException if no file is found
    */
   public static Path[] listOutputFiles(FileSystem fs, Path outputPath) throws IOException {
-    Path[] outfiles = OutputUtils.listOutputFiles(fs, outputPath);
-    if (outfiles.length == 0) {
+    List<Path> outputFiles = Lists.newArrayList();
+    for (FileStatus s : fs.listStatus(outputPath, PathFilters.logsCRCFilter())) {
+      if (!s.isDir() && !s.getPath().getName().startsWith("_")) {
+        outputFiles.add(s.getPath());
+      }
+    }
+    if (outputFiles.isEmpty()) {
       throw new IOException("No output found !");
     }
-    
-    return outfiles;
+    return outputFiles.toArray(new Path[outputFiles.size()]);
   }
-  
+
   /**
    * Formats a time interval in milliseconds to a String in the form "hours:minutes:seconds:millis"
    */