You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2013/03/16 08:24:45 UTC

svn commit: r1457218 - in /mahout/trunk/core/src: main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java test/java/org/apache/mahout/classifier/df/tools/VisualizerTest.java

Author: ssc
Date: Sat Mar 16 07:24:45 2013
New Revision: 1457218

URL: http://svn.apache.org/r1457218
Log:
MAHOUT-1165 TreeVisualizer does not show info of CategoricalNode correctly

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
    mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/tools/VisualizerTest.java

Modified: mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java?rev=1457218&r1=1457217&r2=1457218&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java (original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/classifier/df/tools/TreeVisualizer.java Sat Mar 16 07:24:45 2013
@@ -65,10 +65,9 @@ public final class TreeVisualizer {
           for (int j = 0; j < layer; j++) {
             buff.append("|   ");
           }
-          buff.append(attrNames == null ? attr : attrNames[attr]).append(" = ").append(attrValues[attr][i]);
-          int index = ArrayUtils.indexOf(values, i);
-          if (index >= 0) {
-            buff.append(toStringNode(childs[index], dataset, attrNames, fields, layer + 1));
+          if (values[i] < attrValues[attr].length) {
+            buff.append((attrNames == null ? attr : attrNames[attr]) + " = " + attrValues[attr][(int) values[i]]);
+            buff.append(toStringNode(childs[i], dataset, attrNames, fields, layer + 1));
           }
         }
       } else if (node instanceof NumericalNode) {

Modified: mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/tools/VisualizerTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/tools/VisualizerTest.java?rev=1457218&r1=1457217&r2=1457218&view=diff
==============================================================================
--- mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/tools/VisualizerTest.java (original)
+++ mahout/trunk/core/src/test/java/org/apache/mahout/classifier/df/tools/VisualizerTest.java Sat Mar 16 07:24:45 2013
@@ -82,8 +82,8 @@ public final class VisualizerTest extend
     
     assertEquals(TreeVisualizer.toString(tree, data.getDataset(), ATTR_NAMES),
       "\noutlook = rainy\n|   windy = FALSE : yes\n|   windy = TRUE : no\n"
-        + "outlook = sunny\n|   humidity < 85 : yes\n|   humidity >= 85 : no\n"
-        + "outlook = overcast : yes");
+        + "outlook = overcast : yes\n"
+        + "outlook = sunny\n|   humidity < 85 : yes\n|   humidity >= 85 : no");
   }
   
   @Test