actually fix the category bug, and remove debug lines. ahem.

benfry · benfry · commit c001eb24b0aa · 2014-07-22T16:21:00.000-04:00
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -1503,7 +1503,7 @@ public void setColumnType(int column, int newType) {
         int[] intData = new int[rowCount];
         for (int row = 0; row < rowCount; row++) {
           String s = getString(row, column);
-          intData[row] = PApplet.parseInt(s, missingInt);
+          intData[row] = (s == null) ? missingInt : PApplet.parseInt(s, missingInt);
         }
         columns[column] = intData;
         break;
@@ -1513,7 +1513,7 @@ public void setColumnType(int column, int newType) {
         for (int row = 0; row < rowCount; row++) {
           String s = getString(row, column);
           try {
-            longData[row] = Long.parseLong(s);
+            longData[row] = (s == null) ? missingLong : Long.parseLong(s);
           } catch (NumberFormatException nfe) {
             longData[row] = missingLong;
           }
@@ -1525,7 +1525,7 @@ public void setColumnType(int column, int newType) {
         float[] floatData = new float[rowCount];
         for (int row = 0; row < rowCount; row++) {
           String s = getString(row, column);
-          floatData[row] = PApplet.parseFloat(s, missingFloat);
+          floatData[row] = (s == null) ? missingFloat : PApplet.parseFloat(s, missingFloat);
         }
         columns[column] = floatData;
         break;
@@ -1535,7 +1535,7 @@ public void setColumnType(int column, int newType) {
         for (int row = 0; row < rowCount; row++) {
           String s = getString(row, column);
           try {
-            doubleData[row] = Double.parseDouble(s);
+            doubleData[row] = (s == null) ? missingDouble : Double.parseDouble(s);
           } catch (NumberFormatException nfe) {
             doubleData[row] = missingDouble;
           }
@@ -1861,7 +1861,7 @@ public TableRow addRow(TableRow source) {
       case CATEGORY:
         int index = source.getInt(col);
         setInt(row, col, index);
-        if (columnCategories[col].hasCategory(index)) {
+        if (!columnCategories[col].hasCategory(index)) {
           columnCategories[col].setCategory(index, source.getString(col));
         }
         break;
@@ -3659,11 +3659,11 @@ private void writeln(PrintWriter writer) throws IOException {
 
     void read(DataInputStream input) throws IOException {
       int count = input.readInt();
-      System.out.println("found " + count + " entries in category map");
+      //System.out.println("found " + count + " entries in category map");
       dataToIndex = new HashMap<String, Integer>(count);
       for (int i = 0; i < count; i++) {
         String str = input.readUTF();
-        System.out.println(i + " " + str);
+        //System.out.println(i + " " + str);
         dataToIndex.put(str, i);
         indexToData.add(str);
       }
diff --git a/core/todo.txt b/core/todo.txt
@@ -15,6 +15,8 @@ X add getColumnTitle(int) and getColumnTitles() to TableRow interface
 X fixes for new Table(Iterable)
 X   category data types were not importing their dictionary
 X   column titles weren't set on the new table
+X when using setColumnType(), replace nulls with missingInt, missingFloat, etc
+X   formerly, was throwing a NullPointerException
 
 
 applet removal
