replace random() with choice(), add removeChoice(), remove PApplet param

Author: benfry

core/src/processing/data/DoubleList.java

@@ -688,15 +688,25 @@ public double random() {
   }
 
 
-  /**
-   * Return a random value from the list, using the
-   * randomSeed() from the specified sketch object.
-   */
-  public double random(PApplet sketch) {
+  // see notes in StringList
+//  /**
+//   * Return a random value from the list, using the
+//   * randomSeed() from the specified sketch object.
+//   */
+//  public double random(PApplet sketch) {
+//    if (count == 0) {
+//      throw new ArrayIndexOutOfBoundsException("No entries in this DoubleList");
+//    }
+//    return data[(int) sketch.random(count)];
+//  }
+
+
+  public double removeChoice() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("No entries in this DoubleList");
     }
-    return data[(int) sketch.random(count)];
+    int index = (int) (Math.random() * count);
+    return remove(index);
   }
 
 

core/src/processing/data/FloatList.java

@@ -710,15 +710,24 @@ public float random() {
   }
 
 
-  /**
-   * Return a random value from the list, using the
-   * randomSeed() from the specified sketch object.
-   */
-  public float random(PApplet sketch) {
+//  /**
+//   * Return a random value from the list, using the
+//   * randomSeed() from the specified sketch object.
+//   */
+//  public float random(PApplet sketch) {
+//    if (count == 0) {
+//      throw new ArrayIndexOutOfBoundsException("No entries in this FloatList");
+//    }
+//    return data[(int) sketch.random(count)];
+//  }
+
+
+  public float removeChoice() {
     if (count == 0) {
-      throw new ArrayIndexOutOfBoundsException("No entries in this FloatList");
+      throw new ArrayIndexOutOfBoundsException("No entries in this IntList");
     }
-    return data[(int) sketch.random(count)];
+    int index = (int) (Math.random() * count);
+    return remove(index);
   }
 
 

core/src/processing/data/IntList.java

@@ -677,23 +677,33 @@ public void shuffle(PApplet sketch) {
   /**
    * Return a random value from the list.
    */
-  public int random() {
+  public int choice() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("No entries in this IntList");
     }
     return data[(int) (Math.random() * count)];
   }
 
 
-  /**
-   * Return a random value from the list, using the
-   * randomSeed() from the specified sketch object.
-   */
-  public int random(PApplet sketch) {
+  // see notes in StringList
+//  /**
+//   * Return a random value from the list, using the
+//   * randomSeed() from the specified sketch object.
+//   */
+//  public int choice(PApplet sketch) {
+//    if (count == 0) {
+//      throw new ArrayIndexOutOfBoundsException("No entries in this IntList");
+//    }
+//    return data[(int) sketch.random(count)];
+//  }
+
+
+  public int removeChoice() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("No entries in this IntList");
     }
-    return data[(int) sketch.random(count)];
+    int index = (int) (Math.random() * count);
+    return remove(index);
   }
 
 

core/src/processing/data/LongList.java

@@ -676,17 +676,27 @@ public void shuffle(PApplet sketch) {
   /**
    * Return a random value from the list.
    */
-  public long random() {
+  public long choice() {
     return data[(int) (Math.random() * count)];
   }
 
 
-  /**
-   * Return a random value from the list, using the
-   * randomSeed() from the specified sketch object.
-   */
-  public long random(PApplet sketch) {
-    return data[(int) sketch.random(count)];
+  // see notes in StringList
+//  /**
+//   * Return a random value from the list, using the
+//   * randomSeed() from the specified sketch object.
+//   */
+//  public long choice(PApplet sketch) {
+//    return data[(int) sketch.random(count)];
+//  }
+
+
+  public long removeChoice() {
+    if (count == 0) {
+      throw new ArrayIndexOutOfBoundsException("No entries in this IntList");
+    }
+    int index = (int) (Math.random() * count);
+    return remove(index);
   }
 
 

core/src/processing/data/StringList.java

@@ -578,25 +578,38 @@ public void shuffle(PApplet sketch) {
 
 
   /**
-   * Return a random value from the list.
+   * Return a random value from the list. Throws an exception if there are no
+   * entries available. (Can't just return null because IntList and FloatList
+   * can't do that, and would be inconsistent.)
    */
-  public String random() {
+  public String choice() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("No entries in this StringList");
     }
     return data[(int) (Math.random() * count)];
   }
 
 
-  /**
-   * Return a random value from the list, using the
-   * randomSeed() from the specified sketch object.
-   */
-  public String random(PApplet sketch) {
+  // removing in 4.0.2, seems like overkill... if something this specific is
+  // needed, then better to use a more elaborate/pedantic setup anyway.
+//  /**
+//   * Return a random value from the list, using the
+//   * randomSeed() from the specified sketch object.
+//   */
+//  public String choice(PApplet sketch) {
+//    if (count == 0) {
+//      throw new ArrayIndexOutOfBoundsException("No entries in this StringList");
+//    }
+//    return data[(int) sketch.random(count)];
+//  }
+
+
+  public String removeChoice() {
     if (count == 0) {
       throw new ArrayIndexOutOfBoundsException("No entries in this StringList");
     }
-    return data[(int) sketch.random(count)];
+    int index = (int) (Math.random() * count);
+    return remove(index);
   }
 
 

core/todo.txt

@@ -12,16 +12,20 @@ contribs
 X P3D & P2D window not showing on MacOS Ventura (thx @jaegonlee)
 X   https://github.com/processing/processing4/issues/544
 
+data
+X use choice() instead of random() for list classes
+_ add choice() as a PApplet method for int values of random()?
+
+contrib
 _ Loading SVG file gives Illegal base64 character 20 encoding error (worked in v3.5.4)
 _   https://github.com/processing/processing4/issues/592
 _   https://github.com/processing/processing4/issues/592
 
+
 _ freeze on resize with Windows (even the default renderer)
 _   https://github.com/processing/processing4/issues/507
 
 _ need option for alphabetical ordering for json serialization
-_ use choice() instead of random() for list classes
-_ add choice() as a PApplet method for int values of random()?
 
 _ concurrent StringDict et al
 _   why no concurrent TreemMap? https://stackoverflow.com/a/17656453