eliminato classi superflue del progetto e risolto qualche bug. c'è ancora del lavoro da fare sulla queue e deque

This commit is contained in:
2014-03-23 22:00:57 +01:00
parent 6f3e597f65
commit e3059ed799
10 changed files with 94 additions and 322 deletions

View File

@@ -1,7 +1,7 @@
package stack;
import exceptions.EmptyStackException;
import exceptions.FullStackException;
/**
* Created with MONSTER.
@@ -27,16 +27,18 @@ public class ArrayStack<E> implements Stack<E> {
@Override
public void push(E element) throws FullStackException {
if (isFull()){
public void push(E element) {
if (stack.length == (top + 1)){
E[] stack2 = (E[])new Object[(stack.length *2)];
for (int i = 0; i<= top; i++){
stack2[i] = stack[i];
}
stack = stack2;
stack[++top] = element;
top++;
stack[top] = element;
}else{
stack[++top] = element;
top++;
stack[top] = element;
}
}
@@ -51,7 +53,8 @@ public class ArrayStack<E> implements Stack<E> {
public E pop() throws EmptyStackException {
if (isEmpty())
throw new EmptyStackException();
return stack[top--];
top--;
return stack[top + 1];
}
@Override
@@ -69,9 +72,24 @@ public class ArrayStack<E> implements Stack<E> {
@Override
public int size() {
return (++top);
return (top + 1);
}
@Override
public String toString() {
String to_return = "";
to_return = to_return + "[";
for (int i = 0;i<=top;i++){
if ( i == top){
to_return+=(stack[i].toString());
}else{
to_return+=(stack[i].toString() + ",");
}
}
to_return = to_return + "]";
return to_return;
}
private int top = -1;
private int dcapacity = 100;