missing categories are correctly saved in binary

codeanticode · codeanticode · commit 1b0f1d868aa4 · 2014-04-25T22:53:50.000-04:00
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -1165,7 +1165,12 @@ protected void saveBinary(OutputStream os) throws IOException {
           output.writeDouble(row.getDouble(col));
           break;
         case CATEGORY:
-          output.writeInt(columnCategories[col].index(row.getString(col)));
+          String peace = row.getString(col);
+          if (peace.equals(missingString)) {
+            output.writeInt(missingCategory);
+          } else {
+            output.writeInt(columnCategories[col].index(peace));
+          }
           break;
         }
       }
@@ -4140,7 +4145,12 @@ protected void convertRow(DataOutputStream output, String[] pieces) throws IOExc
         }
         break;
       case CATEGORY:
-        output.writeInt(columnCategories[col].index(pieces[col]));
+        String peace = pieces[col];
+        if (peace.equals(missingString)) {
+          output.writeInt(missingCategory);
+        } else {
+          output.writeInt(columnCategories[col].index(peace));
+        }
         break;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,12 @@ protected void saveBinary(OutputStream os) throws IOException {`
`1165`	`1165`	`output.writeDouble(row.getDouble(col));`
`1166`	`1166`	`break;`
`1167`	`1167`	`case CATEGORY:`
`1168`		`- output.writeInt(columnCategories[col].index(row.getString(col)));`
	`1168`	`+ String peace = row.getString(col);`
	`1169`	`+ if (peace.equals(missingString)) {`
	`1170`	`+ output.writeInt(missingCategory);`
	`1171`	`+ } else {`
	`1172`	`+ output.writeInt(columnCategories[col].index(peace));`
	`1173`	`+ }`
`1169`	`1174`	`break;`
`1170`	`1175`	`}`
`1171`	`1176`	`}`
`@@ -4140,7 +4145,12 @@ protected void convertRow(DataOutputStream output, String[] pieces) throws IOExc`
`4140`	`4145`	`}`
`4141`	`4146`	`break;`
`4142`	`4147`	`case CATEGORY:`
`4143`		`- output.writeInt(columnCategories[col].index(pieces[col]));`
	`4148`	`+ String peace = pieces[col];`
	`4149`	`+ if (peace.equals(missingString)) {`
	`4150`	`+ output.writeInt(missingCategory);`
	`4151`	`+ } else {`
	`4152`	`+ output.writeInt(columnCategories[col].index(peace));`
	`4153`	`+ }`
`4144`	`4154`	`break;`
`4145`	`4155`	`}`
`4146`	`4156`	`}`