@@ -12,56 +12,49 @@ class ArrayList {
1212 void grow (size_t minCapacity) {
1313 int oldCapacity = _array.length ;
1414 int newCapacity = oldCapacity + (oldCapacity >> 1 );
15- if (newCapacity < minCapacity) newCapacity = minCapacity;
15+ if (newCapacity < minCapacity)
16+ newCapacity = minCapacity;
1617 E newArray = new E[newCapacity];
1718 copy (begin (_array), end (_array), begin (newArray));
1819 _array = newArray;
1920 }
2021 void ensureExplicitCapacity (size_t minCapacity) {
21- if (minCapacity > _array.length ) grow (minCapacity);
22+ if (minCapacity > _array.length )
23+ grow (minCapacity);
2224 }
2325 void ensureCapacityInternal (size_t minCapacity) {
24- if (_array.length == 0 ) minCapacity = max (10 , minCapacity);
26+ if (_array.length == 0 )
27+ minCapacity = max (10 , minCapacity);
2528 ensureExplicitCapacity (minCapacity);
2629 }
2730
2831public:
2932 ArrayList (size_t initialCapacity = 10 ) : _size(0 ), _array(new E[initialCapacity]) {}
3033 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]; }
4338 void add (E element) {
4439 ensureCapacityInternal (_size + 1 );
4540 _array[_size++] = element;
4641 }
4742 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 ; }
5144 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;
5348 return -1 ;
5449 }
55- int indexOf (E element) {
56- return indexOfInRange (element, 0 , _size);
57- }
50+ int indexOf (E element) { return indexOfInRange (element, 0 , _size); }
5851 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;
6055 return -1 ;
6156 }
62- int lastIndexOf (E element) {
63- return lastIndexOfInRange (element, 0 , _size);
64- }
57+ int lastIndexOf (E element) { return lastIndexOfInRange (element, 0 , _size); }
6558};
6659
6760
0 commit comments