return null on getString() for NaN values

benfry · benfry · commit c6126a7536d6 · 2014-07-30T09:38:19.000-04:00
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -2984,11 +2984,19 @@ public String getString(int row, int column) {
         return missingString;
       }
       return columnCategories[column].key(cat);
-    } else {
-      return String.valueOf(Array.get(columns[column], row));
+    } else if (columnTypes[column] == FLOAT) {
+      if (Float.isNaN(getFloat(row, column))) {
+        return null;
+      }
+    } else if (columnTypes[column] == DOUBLE) {
+      if (Double.isNaN(getFloat(row, column))) {
+        return null;
+      }
     }
+    return String.valueOf(Array.get(columns[column], row));
   }
 
+
   /**
    * @param columnName title of the column to reference
    */
@@ -3443,9 +3451,9 @@ public void replace(String orig, String replacement, String colName) {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  public void replaceAll(String orig, String replacement) {
+  public void replaceAll(String regex, String replacement) {
     for (int col = 0; col < columns.length; col++) {
-      replaceAll(orig, replacement, col);
+      replaceAll(regex, replacement, col);
     }
   }
 
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,6 +1,10 @@
 0229 core (3.0a2)
 X add copy() method to Table
 
+_ need a better method for "missing" data in Table
+_   if missing int is zero, can't just remove those values from saving a table
+_   but for NaN values, it's a necessity
+
 
 pulls
 X implement A and a (elliptical arcs)

Original file line number	Diff line number	Diff line change
`@@ -2984,11 +2984,19 @@ public String getString(int row, int column) {`
`2984`	`2984`	`return missingString;`
`2985`	`2985`	`}`
`2986`	`2986`	`return columnCategories[column].key(cat);`
`2987`		`- } else {`
`2988`		`- return String.valueOf(Array.get(columns[column], row));`
	`2987`	`+ } else if (columnTypes[column] == FLOAT) {`
	`2988`	`+ if (Float.isNaN(getFloat(row, column))) {`
	`2989`	`+ return null;`
	`2990`	`+ }`
	`2991`	`+ } else if (columnTypes[column] == DOUBLE) {`
	`2992`	`+ if (Double.isNaN(getFloat(row, column))) {`
	`2993`	`+ return null;`
	`2994`	`+ }`
`2989`	`2995`	`}`
	`2996`	`+ return String.valueOf(Array.get(columns[column], row));`
`2990`	`2997`	`}`
`2991`	`2998`
	`2999`	`+`
`2992`	`3000`	`/**`
`2993`	`3001`	`* @param columnName title of the column to reference`
`2994`	`3002`	`*/`
`@@ -3443,9 +3451,9 @@ public void replace(String orig, String replacement, String colName) {`
`3443`	`3451`	`// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .`
`3444`	`3452`
`3445`	`3453`
`3446`		`- public void replaceAll(String orig, String replacement) {`
	`3454`	`+ public void replaceAll(String regex, String replacement) {`
`3447`	`3455`	`for (int col = 0; col < columns.length; col++) {`
`3448`		`- replaceAll(orig, replacement, col);`
	`3456`	`+ replaceAll(regex, replacement, col);`
`3449`	`3457`	`}`
`3450`	`3458`	`}`
`3451`	`3459`