@@ -12,56 +12,49 @@ class ArrayList {
12
12
void grow (size_t minCapacity) {
13
13
int oldCapacity = _array.length ;
14
14
int newCapacity = oldCapacity + (oldCapacity >> 1 );
15
- if (newCapacity < minCapacity) newCapacity = minCapacity;
15
+ if (newCapacity < minCapacity)
16
+ newCapacity = minCapacity;
16
17
E newArray = new E[newCapacity];
17
18
copy (begin (_array), end (_array), begin (newArray));
18
19
_array = newArray;
19
20
}
20
21
void ensureExplicitCapacity (size_t minCapacity) {
21
- if (minCapacity > _array.length ) grow (minCapacity);
22
+ if (minCapacity > _array.length )
23
+ grow (minCapacity);
22
24
}
23
25
void ensureCapacityInternal (size_t minCapacity) {
24
- if (_array.length == 0 ) minCapacity = max (10 , minCapacity);
26
+ if (_array.length == 0 )
27
+ minCapacity = max (10 , minCapacity);
25
28
ensureExplicitCapacity (minCapacity);
26
29
}
27
30
28
31
public:
29
32
ArrayList (size_t initialCapacity = 10 ) : _size(0 ), _array(new E[initialCapacity]) {}
30
33
ArrayList (E *const initialArray) : _size(0 ), _array(initialArray) {}
31
- ~ArrayList () {
32
- delete[] _array;
33
- }
34
- int size () {
35
- return _size;
36
- }
37
- E *const &toArray () {
38
- return _array;
39
- }
40
- E get (int index) {
41
- return _array[index];
42
- }
34
+ ~ArrayList () { delete[] _array; }
35
+ int size () { return _size; }
36
+ E *const &toArray () { return _array; }
37
+ E get (int index) { return _array[index]; }
43
38
void add (E element) {
44
39
ensureCapacityInternal (_size + 1 );
45
40
_array[_size++] = element;
46
41
}
47
42
bool insert (int index, E element);
48
- bool contains (E element) {
49
- return indexOf (element) >= 0 ;
50
- }
43
+ bool contains (E element) { return indexOf (element) >= 0 ; }
51
44
int indexOfInRange (E element, int start, int stop) {
52
- for (int i = start; i < stop; i++) if (_array[i] == element) return i;
45
+ for (int i = start; i < stop; i++)
46
+ if (_array[i] == element)
47
+ return i;
53
48
return -1 ;
54
49
}
55
- int indexOf (E element) {
56
- return indexOfInRange (element, 0 , _size);
57
- }
50
+ int indexOf (E element) { return indexOfInRange (element, 0 , _size); }
58
51
int lastIndexOfInRange (E element, int start, int stop) {
59
- for (int i = stop - 1 ; i >= start; i--) if (_array[i] == element) return i;
52
+ for (int i = stop - 1 ; i >= start; i--)
53
+ if (_array[i] == element)
54
+ return i;
60
55
return -1 ;
61
56
}
62
- int lastIndexOf (E element) {
63
- return lastIndexOfInRange (element, 0 , _size);
64
- }
57
+ int lastIndexOf (E element) { return lastIndexOfInRange (element, 0 , _size); }
65
58
};
66
59
67
60
0 commit comments