svn commit: r1006264 - in /mahout/trunk: core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java

[srowen]

Author: srowen
Date: Sun Oct 10 09:56:49 2010
New Revision: 1006264

URL: http://svn.apache.org/viewvc?rev=1006264&view=rev
Log:
Joe's fix to TrainNewsGroups listFiles() call

Modified:
    
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java
    
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java?rev=1006264&r1=1006263&r2=1006264&view=diff
==============================================================================
--- 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java
 (original)
+++ 
mahout/trunk/core/src/main/java/org/apache/mahout/classifier/sgd/AdaptiveLogisticRegression.java
 Sun Oct 10 09:56:49 2010
@@ -134,7 +134,7 @@ public class AdaptiveLogisticRegression 
     } catch (InterruptedException e) {
       // ignore ... shouldn't happen
     } catch (ExecutionException e) {
-      throw new IllegalStateException(e);
+      throw new IllegalStateException(e.getCause());
     }
     buffer.clear();
 

Modified: 
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java?rev=1006264&r1=1006263&r2=1006264&view=diff
==============================================================================
--- 
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java
 (original)
+++ 
mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainNewsGroups.java
 Sun Oct 10 09:56:49 2010
@@ -142,8 +142,10 @@ public final class TrainNewsGroups {
 
     List<File> files = Lists.newArrayList();
     for (File newsgroup : base.listFiles()) {
-      newsGroups.intern(newsgroup.getName());
-      files.addAll(Arrays.asList(newsgroup.listFiles()));
+      if (newsgroup.isDirectory()) {
+        newsGroups.intern(newsgroup.getName());
+        files.addAll(Arrays.asList(newsgroup.listFiles()));
+      }
     }
     Collections.shuffle(files);
     System.out.printf("%d training files\n", files.size());