Update processing Lists and Dict

Author: monkstone

src/main/java/processing/data/DoubleDict.java

@@ -1,6 +1,9 @@
 package processing.data;
 
-import java.io.*;
+//import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -36,9 +39,10 @@ public DoubleDict() {
 
 
   /**
-   * Create a new lookup with a specific size. This is more efficient than not
-   * specifying a size. Use it when you know the rough size of the thing you're creating.
+   * Create a new lookup with a specific size.This is more efficient than not
+ specifying a size. Use it when you know the rough size of the thing you're creating.
    *
+   * @param length
    * @nowebref
    */
   public DoubleDict(int length) {
@@ -52,26 +56,29 @@ public DoubleDict(int length) {
    * Read a set of entries from a Reader that has each key/value pair on
    * a single line, separated by a tab.
    *
+   * @param reader
    * @nowebref
    */
   public DoubleDict(BufferedReader reader) {
     String[] lines = PApplet.loadStrings(reader);
     keys = new String[lines.length];
     values = new double[lines.length];
 
-    for (int i = 0; i < lines.length; i++) {
-      String[] pieces = PApplet.split(lines[i], '\t');
-      if (pieces.length == 2) {
-        keys[count] = pieces[0];
-        values[count] = PApplet.parseFloat(pieces[1]);
-        indices.put(pieces[0], count);
-        count++;
+      for (String line : lines) {
+          String[] pieces = PApplet.split(line, '\t');
+          if (pieces.length == 2) {
+              keys[count] = pieces[0];
+              values[count] = PApplet.parseFloat(pieces[1]);
+              indices.put(pieces[0], count);
+              count++;
+          }
       }
-    }
   }
 
 
   /**
+   * @param keys
+   * @param values
    * @nowebref
    */
   public DoubleDict(String[] keys, double[] values) {
@@ -95,6 +102,7 @@ public DoubleDict(String[] keys, double[] values) {
    *   { "key2", 2 }
    * });
    * </pre>
+   * @param pairs
    */
   public DoubleDict(Object[][] pairs) {
     count = pairs.length;
@@ -123,6 +131,7 @@ public DoubleDict(Map<String, Double> incoming) {
 
 
   /**
+   * @return 
    * @webref doubledict:method
    * @brief Returns the number of key/value pairs
    */
@@ -132,8 +141,8 @@ public int size() {
 
 
   /**
-   * Resize the internal data, this can only be used to shrink the list.
-   * Helpful for situations like sorting and then grabbing the top 50 entries.
+   * Resize the internal data, this can only be used to shrink the list.Helpful for situations like sorting and then grabbing the top 50 entries.
+   * @param length
    */
   public void resize(int length) {
     if (length == count) return;
@@ -191,30 +200,28 @@ public class Entry {
 
 
   public Iterable<Entry> entries() {
-    return new Iterable<Entry>() {
-
-      public Iterator<Entry> iterator() {
-        return entryIterator();
-      }
-    };
+    return this::entryIterator;
   }
 
 
   public Iterator<Entry> entryIterator() {
     return new Iterator<Entry>() {
       int index = -1;
 
+      @Override
       public void remove() {
         removeIndex(index);
         index--;
       }
 
+      @Override
       public Entry next() {
         ++index;
         Entry e = new Entry(keys[index], values[index]);
         return e;
       }
 
+      @Override
       public boolean hasNext() {
         return index+1 < size();
       }
@@ -239,13 +246,7 @@ protected void crop() {
 
 
   public Iterable<String> keys() {
-    return new Iterable<String>() {
-
-      @Override
-      public Iterator<String> iterator() {
-        return keyIterator();
-      }
-    };
+    return this::keyIterator;
   }
 
 
@@ -254,15 +255,18 @@ public Iterator<String> keyIterator() {
     return new Iterator<String>() {
       int index = -1;
 
+      @Override
       public void remove() {
         removeIndex(index);
         index--;
       }
 
+      @Override
       public String next() {
         return key(++index);
       }
 
+      @Override
       public boolean hasNext() {
         return index+1 < size();
       }
@@ -271,8 +275,9 @@ public boolean hasNext() {
 
 
   /**
-   * Return a copy of the internal keys array. This array can be modified.
+   * Return a copy of the internal keys array.This array can be modified.
    *
+   * @return 
    * @webref doubledict:method
    * @brief Return a copy of the internal keys array
    */
@@ -297,33 +302,31 @@ public double value(int index) {
 
 
   /**
+     * @return 
    * @webref doubledict:method
    * @brief Return the internal array being used to store the values
    */
   public Iterable<Double> values() {
-    return new Iterable<Double>() {
-
-      @Override
-      public Iterator<Double> iterator() {
-        return valueIterator();
-      }
-    };
+    return () -> valueIterator();
   }
 
 
   public Iterator<Double> valueIterator() {
     return new Iterator<Double>() {
       int index = -1;
 
+      @Override
       public void remove() {
         removeIndex(index);
         index--;
       }
 
+      @Override
       public Double next() {
         return value(++index);
       }
 
+      @Override
       public boolean hasNext() {
         return index+1 < size();
       }
@@ -334,6 +337,7 @@ public boolean hasNext() {
   /**
    * Create a new array and copy each of the values into it.
    *
+   * @return 
    * @webref doubledict:method
    * @brief Create a new array and copy each of the values into it
    */
@@ -345,8 +349,10 @@ public double[] valueArray() {
 
   /**
    * Fill an already-allocated array with the values (more efficient than
-   * creating a new array each time). If 'array' is null, or not the same
+   * creating a new array each time).If 'array' is null, or not the same
    * size as the number of values, a new array will be allocated and returned.
+   * @param array
+   * @return 
    */
   public double[] valueArray(double[] array) {
     if (array == null || array.length != size()) {
@@ -360,6 +366,8 @@ public double[] valueArray(double[] array) {
   /**
    * Return a value for the specified key.
    *
+   * @param key
+   * @return 
    * @webref doubledict:method
    * @brief Return a value for the specified key
    */
@@ -382,6 +390,8 @@ public double get(String key, double alternate) {
 
 
   /**
+   * @param key
+   * @param amount
    * @webref doubledict:method
    * @brief Create a new key/value pair or change the value of one
    */
@@ -405,6 +415,8 @@ public void setIndex(int index, String key, double value) {
 
 
   /**
+   * @param key
+   * @return 
    * @webref doubledict:method
    * @brief Check if a key is a part of the data structure
    */
@@ -414,6 +426,8 @@ public boolean hasKey(String key) {
 
 
   /**
+   * @param key
+   * @param amount
    * @webref doubledict:method
    * @brief Add to a value
    */
@@ -428,6 +442,8 @@ public void add(String key, double amount) {
 
 
   /**
+   * @param key
+   * @param amount
    * @webref doubledict:method
    * @brief Subtract from a value
    */
@@ -437,6 +453,8 @@ public void sub(String key, double amount) {
 
 
   /**
+   * @param key
+   * @param amount
    * @webref doubledict:method
    * @brief Multiply a value
    */
@@ -449,6 +467,8 @@ public void mult(String key, double amount) {
 
 
   /**
+   * @param key
+   * @param amount
    * @webref doubledict:method
    * @brief Divide a value
    */
@@ -471,6 +491,7 @@ private void checkMinMax(String functionName) {
 
 
   /**
+   * @return 
    * @webref doublelist:method
    * @brief Return the smallest value
    */
@@ -525,6 +546,7 @@ public double minValue() {
 
 
   /**
+   * @return 
    * @webref doublelist:method
    * @brief Return the largest value
    */
@@ -558,7 +580,8 @@ public int maxIndex() {
   }
 
 
-  /** The key for a max value; null if empty or everything is NaN (no max). */
+  /** The key for a max value; null if empty or everything is NaN (no max).
+   * @return  */
   public String maxKey() {
     //checkMinMax("maxKey");
     int index = maxIndex();
@@ -569,7 +592,8 @@ public String maxKey() {
   }
 
 
-  /** The max value. (Or NaN if no entries or they're all NaN.) */
+  /** *  The max value.(Or NaN if no entries or they're all NaN.)
+   * @return  */
   public double maxValue() {
     //checkMinMax("maxValue");
     int index = maxIndex();
@@ -591,7 +615,7 @@ public double sum() {
 
   public int index(String what) {
     Integer found = indices.get(what);
-    return (found == null) ? -1 : found.intValue();
+    return (found == null) ? -1 : found;
   }
 
 
@@ -600,14 +624,16 @@ protected void create(String what, double much) {
       keys = PApplet.expand(keys);
       values = PApplet.expand(values);
     }
-    indices.put(what, Integer.valueOf(count));
+    indices.put(what, count);
     keys[count] = what;
     values[count] = much;
     count++;
   }
 
 
   /**
+   * @param key
+   * @return 
    * @webref doubledict:method
    * @brief Remove a key/value pair
    */
@@ -789,7 +815,8 @@ public DoubleDict getPercent() {
   }
 
 
-  /** Returns a duplicate copy of this object. */
+  /** Returns a duplicate copy of this object.
+   * @return  */
   public DoubleDict copy() {
     DoubleDict outgoing = new DoubleDict(count);
     System.arraycopy(keys, 0, outgoing.keys, 0, count);
@@ -811,11 +838,12 @@ public void print() {
 
   /**
    * Save tab-delimited entries to a file (TSV format, UTF-8 encoding)
+   * @param file
    */
   public void save(File file) {
-    PrintWriter writer = PApplet.createWriter(file);
-    write(writer);
-    writer.close();
+      try (PrintWriter writer = PApplet.createWriter(file)) {
+          write(writer);
+      }
   }
 
 
@@ -833,6 +861,7 @@ public void write(PrintWriter writer) {
 
   /**
    * Return this dictionary as a String in JSON format.
+   * @return 
    */
   public String toJSON() {
     StringList items = new StringList();