Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

done #1557

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

done #1557

Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 74 additions & 9 deletions src/main/java/core/basesyntax/ArrayList.java
Original file line number Diff line number Diff line change
@@ -1,48 +1,113 @@
package core.basesyntax;

import java.util.Arrays;
import java.util.NoSuchElementException;

public class ArrayList<T> implements List<T> {
private Object[] elements;
private int size;

public ArrayList() {
elements = new Object[10];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

10 is a magic number, create constant

size = 0;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

int type = 0 by default

Suggested change
size = 0;

}

@Override
public void add(T value) {

ifFullResize();
elements[size++] = value;
}

@Override
public void add(T value, int index) {

validateIndexForAdd(index);
ifFullResize();
if (index >= 0 && index <= size) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The index check if (index >= 0 && index <= size) is redundant because validateIndexForAdd(index) already ensures the index is within bounds. You can remove this check.

for (int i = size; i > index; i--) {
elements[i] = elements[i - 1];
}
elements[index] = value;
size++;
}
}

@Override
public void addAll(List<T> list) {

for (int i = 0; i < list.size(); i++) {
add(list.get(i));
}
}

@Override
public T get(int index) {
return null;
validateIndex(index);
return (T) elements[index];
}

@Override
public void set(T value, int index) {

validateIndex(index);
elements[index] = value;
}

@Override
public T remove(int index) {
return null;
validateIndex(index);
ifFullResize();

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The call to ifFullResize() is unnecessary in the remove(int index) method. Resizing is not needed when removing elements, so this line can be removed.

T removedElement = (T) elements[index];
for (int i = index; i < size - 1; i++) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

elements[i] = elements[i + 1];
}
size--;
return removedElement;
}

@Override
public T remove(T element) {
return null;
for (int i = 0; i < size; i++) {
if (elements[i] != null && elements[i].equals(element)
|| elements[i] == null && element == null) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (elements[i] != null && elements[i].equals(element)
|| elements[i] == null && element == null) {
if (elements[i] != null && elements[i].equals(element)
|| elements[i] == element) {

return remove(i);
}
}
throw new NoSuchElementException("Element not found in the list");
}

@Override
public int size() {
return 0;
return size;
}

@Override
public boolean isEmpty() {
return false;
return size == 0;
}

private void ifFullResize() {
if (size == elements.length) {
resize();
}
}

private void resize() {
elements = Arrays.copyOf(elements, elements.length + (elements.length / 2));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}

private void validateIndex(int index) {
if (index < 0 || index >= size) {
throw new ArrayListIndexOutOfBoundsException("Index "
+ index
+ " is out of bounds for size "
+ size);
}
}

private void validateIndexForAdd(int index) {
if (index < 0 || index > size) {
throw new ArrayListIndexOutOfBoundsException("Index "
+ index
+ " is out of bounds for size "
+ size);
}
}
}
Loading