You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sm...@apache.org on 2013/12/21 19:26:55 UTC

svn commit: r1552933 - /mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java

Author: smarthi
Date: Sat Dec 21 18:26:55 2013
New Revision: 1552933

URL: http://svn.apache.org/r1552933
Log:
Code cleanup, removed continue statements in loops

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java?rev=1552933&r1=1552932&r2=1552933&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/data/DataConverter.java Sat Dec 21 18:26:55 2013
@@ -49,22 +49,20 @@ public class DataConverter {
 
     int aId = 0;
     for (int attr = 0; attr < nball; attr++) {
-      if (ArrayUtils.contains(dataset.getIgnored(), attr)) {
-        continue; // IGNORED
-      }
-
-      String token = tokens[attr].trim();
+      if (!ArrayUtils.contains(dataset.getIgnored(), attr)) {
+        String token = tokens[attr].trim();
 
-      if ("?".equals(token)) {
-        // missing value
-        return null;
-      }
+        if ("?".equals(token)) {
+          // missing value
+          return null;
+        }
 
-      if (dataset.isNumerical(aId)) {
-        vector.set(aId++, Double.parseDouble(token));
-      } else { // CATEGORICAL
-        vector.set(aId, dataset.valueOf(aId, token));
-        aId++;
+        if (dataset.isNumerical(aId)) {
+          vector.set(aId++, Double.parseDouble(token));
+        } else { // CATEGORICAL
+          vector.set(aId, dataset.valueOf(aId, token));
+          aId++;
+        }
       }
     }