Skip to content

Commit 0145c22

Browse files
benfrybenfry
committed
switch to getSubset(), mult() instead of mul(), add upper/lower
1 parent 1f9ccfd commit 0145c22

File tree

5 files changed

+93
-105
lines changed

5 files changed

+93
-105
lines changed

‎core/src/processing/data/FloatList.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ public FloatList() {
1717
}
1818

1919

20+
public FloatList(int length) {
21+
data = new float[length];
22+
}
23+
24+
2025
public FloatList(float[] list) {
2126
count = list.length;
2227
data = new float[count];
@@ -387,7 +392,7 @@ public void sub(int index, float amount) {
387392
}
388393

389394

390-
public void mul(int index, float amount) {
395+
public void mult(int index, float amount) {
391396
data[index] *= amount;
392397
}
393398

‎core/src/processing/data/IntDict.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public void sub(String key, int amount) {
271271
}
272272

273273

274-
public void mul(String key, int amount) {
274+
public void mult(String key, int amount) {
275275
int index = index(key);
276276
if (index != -1) {
277277
values[index] *= amount;

‎core/src/processing/data/IntList.java‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ public IntList() {
2727
}
2828

2929

30+
public IntList(int length) {
31+
data = new int[length];
32+
}
33+
34+
3035
public IntList(int[] source) {
3136
count = source.length;
3237
data = new int[count];
@@ -329,7 +334,7 @@ public void sub(int index, int amount) {
329334
}
330335

331336

332-
public void mul(int index, int amount) {
337+
public void mult(int index, int amount) {
333338
data[index] *= amount;
334339
}
335340

@@ -397,17 +402,17 @@ public void swap(int a, int b) {
397402
// }
398403

399404

400-
public void subset(int start) {
401-
subset(start, count - start);
402-
}
403-
404-
405-
public void subset(int start, int num) {
406-
for (int i = 0; i < num; i++) {
407-
data[i] = data[i+start];
408-
}
409-
count = num;
410-
}
405+
// public void subset(int start) {
406+
// subset(start, count - start);
407+
// }
408+
//
409+
//
410+
// public void subset(int start, int num) {
411+
// for (int i = 0; i < num; i++) {
412+
// data[i] = data[i+start];
413+
// }
414+
// count = num;
415+
// }
411416

412417

413418
public void reverse() {
@@ -558,6 +563,20 @@ public int[] array(int[] array) {
558563
// }
559564

560565

566+
public IntList getSubset(int start) {
567+
return getSubset(start, count - start);
568+
}
569+
570+
571+
public IntList getSubset(int start, int num) {
572+
IntList outgoing = new IntList(num);
573+
for (int i = 0; i < num; i++) {
574+
System.arraycopy(data, start, outgoing.data, 0, num);
575+
}
576+
return outgoing;
577+
}
578+
579+
561580
@Override
562581
public String toString() {
563582
StringBuilder sb = new StringBuilder();

‎core/src/processing/data/Sort.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package processing.data;
22

33

4+
/**
5+
* Internal sorter used by several data classes.
6+
* Advanced users only, not official API.
7+
*/
48
public abstract class Sort implements Runnable {
59

610
public Sort() { }

‎core/src/processing/data/StringList.java‎

Lines changed: 51 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ public class StringList implements Iterable<String> {
1313

1414

1515
public StringList() {
16-
data = new String[10];
16+
this(10);
17+
}
18+
19+
20+
public StringList(int length) {
21+
data = new String[length];
1722
}
1823

1924

@@ -358,85 +363,6 @@ public boolean hasValue(String value) {
358363
}
359364

360365

361-
// public void increment(int index) {
362-
// data[index]++;
363-
// }
364-
//
365-
//
366-
// public void add(int index, int amount) {
367-
// data[index] += amount;
368-
// }
369-
//
370-
//
371-
// public void sub(int index, int amount) {
372-
// data[index] -= amount;
373-
// }
374-
//
375-
//
376-
// public void mul(int index, int amount) {
377-
// data[index] *= amount;
378-
// }
379-
//
380-
//
381-
// public void div(int index, int amount) {
382-
// data[index] /= amount;
383-
// }
384-
385-
386-
// public String min() {
387-
// if (count == 0) {
388-
// throw new ArrayIndexOutOfBoundsException("Cannot use min() on IntList of length 0.");
389-
// }
390-
// if (data.length == 0) {
391-
// return String.NaN;
392-
// }
393-
// String m = Float.NaN;
394-
// for (int i = 0; i < data.length; i++) {
395-
// // find one good value to start
396-
// if (data[i] == data[i]) {
397-
// m = data[i];
398-
//
399-
// // calculate the rest
400-
// for (int j = i+1; j < data.length; j++) {
401-
// float d = data[j];
402-
// if (!Float.isNaN(d) && (d < m)) {
403-
// m = data[j];
404-
// }
405-
// }
406-
// break;
407-
// }
408-
// }
409-
// return m;
410-
// }
411-
412-
413-
// public float max() {
414-
// if (count == 0) {
415-
// throw new ArrayIndexOutOfBoundsException("Cannot use max() on IntList of length 0.");
416-
// }
417-
// if (data.length == 0) {
418-
// return Float.NaN;
419-
// }
420-
// float m = Float.NaN;
421-
// for (int i = 0; i < data.length; i++) {
422-
// // find one good value to start
423-
// if (data[i] == data[i]) {
424-
// m = data[i];
425-
//
426-
// // calculate the rest
427-
// for (int j = i+1; j < data.length; j++) {
428-
// float d = data[j];
429-
// if (!Float.isNaN(d) && (d > m)) {
430-
// m = data[j];
431-
// }
432-
// }
433-
// break;
434-
// }
435-
// }
436-
// return m;
437-
// }
438-
439-
440366
/** Sorts the array in place. */
441367
public void sort() {
442368
sortImpl(false);
@@ -477,17 +403,17 @@ public void swap(int a, int b) {
477403
// }
478404

479405

480-
public void subset(int start) {
481-
subset(start, count - start);
482-
}
483-
484-
485-
public void subset(int start, int num) {
486-
for (int i = 0; i < num; i++) {
487-
data[i] = data[i+start];
488-
}
489-
count = num;
490-
}
406+
// public void subset(int start) {
407+
// subset(start, count - start);
408+
// }
409+
//
410+
//
411+
// public void subset(int start, int num) {
412+
// for (int i = 0; i < num; i++) {
413+
// data[i] = data[i+start];
414+
// }
415+
// count = num;
416+
// }
491417

492418

493419
public void reverse() {
@@ -534,6 +460,26 @@ public void shuffle(PApplet sketch) {
534460
}
535461

536462

463+
/** Make the entire list lower case. */
464+
public void lower() {
465+
for (int i = 0; i < count; i++) {
466+
if (data[i] != null) {
467+
data[i] = data[i].toLowerCase();
468+
}
469+
}
470+
}
471+
472+
473+
/** Make the entire list upper case. */
474+
public void upper() {
475+
for (int i = 0; i < count; i++) {
476+
if (data[i] != null) {
477+
data[i] = data[i].toUpperCase();
478+
}
479+
}
480+
}
481+
482+
537483
public StringList copy() {
538484
StringList outgoing = new StringList(data);
539485
outgoing.count = count;
@@ -599,6 +545,20 @@ public String[] array(String[] array) {
599545
}
600546

601547

548+
public StringList getSubset(int start) {
549+
return getSubset(start, count - start);
550+
}
551+
552+
553+
public StringList getSubset(int start, int num) {
554+
StringList outgoing = new StringList(num);
555+
for (int i = 0; i < num; i++) {
556+
System.arraycopy(data, start, outgoing.data, 0, num);
557+
}
558+
return outgoing;
559+
}
560+
561+
602562
/** Get a list of all unique entries. */
603563
public String[] getUnique() {
604564
return getTally().keyArray();

0 commit comments

Comments
 (0)