bug fixing on Dict and List classes, add Iterable constructor

benfry · benfry · commit 1a8d2fa5dbb8 · 2013-05-01T14:54:54.000-04:00
diff --git a/core/src/processing/data/FloatDict.java b/core/src/processing/data/FloatDict.java
@@ -70,6 +70,9 @@ public FloatDict(String[] keys, float[] values) {
     this.keys = keys;
     this.values = values;
     count = keys.length;
+    for (int i = 0; i < count; i++) {
+      indices.put(keys[i], i);
+    }
   }
 
 
@@ -81,6 +84,7 @@ public int size() {
   /** Remove all entries. */
   public void clear() {
     count = 0;
+    indices = new HashMap<String, Integer>();
   }
 
 
diff --git a/core/src/processing/data/FloatList.java b/core/src/processing/data/FloatList.java
@@ -29,6 +29,13 @@ public FloatList(float[] list) {
   }
 
 
+  public FloatList(Iterable<Float> iter) {
+    this(10);
+    for (float v : iter) {
+      append(v);
+    }
+  }
+
 
   /**
    * Improve efficiency by removing allocated but unused entries from the
diff --git a/core/src/processing/data/IntDict.java b/core/src/processing/data/IntDict.java
@@ -93,6 +93,9 @@ public IntDict(String[] keys, int[] values) {
     this.keys = keys;
     this.values = values;
     count = keys.length;
+    for (int i = 0; i < count; i++) {
+      indices.put(keys[i], i);
+    }
   }
 
 
@@ -104,6 +107,7 @@ public int size() {
   /** Remove all entries. */
   public void clear() {
     count = 0;
+    indices = new HashMap<String, Integer>();
   }
 
 
diff --git a/core/src/processing/data/IntList.java b/core/src/processing/data/IntList.java
@@ -39,6 +39,14 @@ public IntList(int[] source) {
   }
 
 
+  public IntList(Iterable<Integer> iter) {
+    this(10);
+    for (int v : iter) {
+      append(v);
+    }
+  }
+
+
   /**
    * Improve efficiency by removing allocated but unused entries from the
    * internal array used to store the data. Set to private, though it could
diff --git a/core/src/processing/data/StringDict.java b/core/src/processing/data/StringDict.java
@@ -68,6 +68,9 @@ public StringDict(String[] keys, String[] values) {
     this.keys = keys;
     this.values = values;
     count = keys.length;
+    for (int i = 0; i < count; i++) {
+      indices.put(keys[i], i);
+    }
   }
 
 
@@ -79,6 +82,7 @@ public int size() {
   /** Remove all entries. */
   public void clear() {
     count = 0;
+    indices = new HashMap<String, Integer>();
   }
 
 
diff --git a/core/src/processing/data/StringList.java b/core/src/processing/data/StringList.java
@@ -29,6 +29,15 @@ public StringList(String[] list) {
   }
 
 
+  // Create from something iterable, for instance:
+  // StringList list = new StringList(hashMap.keySet());
+  public StringList(Iterable<String> iter) {
+    this(10);
+    for (String s : iter) {
+      append(s);
+    }
+  }
+
 
   /**
    * Improve efficiency by removing allocated but unused entries from the
diff --git a/core/src/processing/data/Table.java b/core/src/processing/data/Table.java
@@ -3391,7 +3391,7 @@ public StringDict getStringDict(String keyColumnName, String valueColumnName) {
 
   public StringDict getStringDict(int keyColumn, int valueColumn) {
     return new StringDict(getStringColumn(keyColumn),
-                       getStringColumn(valueColumn));
+                          getStringColumn(valueColumn));
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ public FloatDict(String[] keys, float[] values) {`
`70`	`70`	`this.keys = keys;`
`71`	`71`	`this.values = values;`
`72`	`72`	`count = keys.length;`
	`73`	`+ for (int i = 0; i < count; i++) {`
	`74`	`+ indices.put(keys[i], i);`
	`75`	`+ }`
`73`	`76`	`}`
`74`	`77`
`75`	`78`
`@@ -81,6 +84,7 @@ public int size() {`
`81`	`84`	`/** Remove all entries. */`
`82`	`85`	`public void clear() {`
`83`	`86`	`count = 0;`
	`87`	`+ indices = new HashMap<String, Integer>();`
`84`	`88`	`}`
`85`	`89`
`86`	`90`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ public IntDict(String[] keys, int[] values) {`
`93`	`93`	`this.keys = keys;`
`94`	`94`	`this.values = values;`
`95`	`95`	`count = keys.length;`
	`96`	`+ for (int i = 0; i < count; i++) {`
	`97`	`+ indices.put(keys[i], i);`
	`98`	`+ }`
`96`	`99`	`}`
`97`	`100`
`98`	`101`
`@@ -104,6 +107,7 @@ public int size() {`
`104`	`107`	`/** Remove all entries. */`
`105`	`108`	`public void clear() {`
`106`	`109`	`count = 0;`
	`110`	`+ indices = new HashMap<String, Integer>();`
`107`	`111`	`}`
`108`	`112`
`109`	`113`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ public StringDict(String[] keys, String[] values) {`
`68`	`68`	`this.keys = keys;`
`69`	`69`	`this.values = values;`
`70`	`70`	`count = keys.length;`
	`71`	`+ for (int i = 0; i < count; i++) {`
	`72`	`+ indices.put(keys[i], i);`
	`73`	`+ }`
`71`	`74`	`}`
`72`	`75`
`73`	`76`
`@@ -79,6 +82,7 @@ public int size() {`
`79`	`82`	`/** Remove all entries. */`
`80`	`83`	`public void clear() {`
`81`	`84`	`count = 0;`
	`85`	`+ indices = new HashMap<String, Integer>();`
`82`	`86`	`}`
`83`	`87`
`84`	`88`
Original file line number	Diff line number	Diff line change
`@@ -3391,7 +3391,7 @@ public StringDict getStringDict(String keyColumnName, String valueColumnName) {`
`3391`	`3391`
`3392`	`3392`	`public StringDict getStringDict(int keyColumn, int valueColumn) {`
`3393`	`3393`	`return new StringDict(getStringColumn(keyColumn),`
`3394`		`- getStringColumn(valueColumn));`
	`3394`	`+ getStringColumn(valueColumn));`
`3395`	`3395`	`}`
`3396`	`3396`
`3397`	`3397`