Skip to content

Commit 54db23e

Browse files
hongxin230hongxin230
committed
a
1 parent 4f7b480 commit 54db23e

File tree

13 files changed

+136
-52
lines changed

13 files changed

+136
-52
lines changed

‎group05/1094051862/test01/src/com/coding1094051862/basic/.gitignore renamed to ‎group05/1094051862/test01/src/com/coding/basic/.gitignore

File renamed without changes.

‎group05/1094051862/test01/src/com/coding1094051862/basic/ArrayListTest.java renamed to ‎group05/1094051862/test01/src/com/coding/basic/ArrayListTest.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.coding1094051862.basic;
1+
package com.coding.basic;
22

33
import org.junit.Assert;
44
import org.junit.Test;
@@ -7,7 +7,7 @@ public class ArrayListTest {
77

88
@Test
99
public void test() {
10-
ArrayList list = new ArrayList();
10+
List list = new ArrayList();
1111
for(int i = 0; i < 10; i++) {
1212
list.add(i);
1313
}
@@ -18,6 +18,14 @@ public void test() {
1818
Assert.assertEquals(12, list.size());
1919
Assert.assertEquals(99, list.remove(3));
2020
Assert.assertEquals(11, list.size());
21+
Iterator iterator = list.iterator();
22+
for (int i = 0; i< list.size(); i++) {
23+
System.out.println(list.get(i));
24+
}
25+
System.out.println("======");
26+
while (iterator.hasNext()) {
27+
System.out.println(iterator.next());
28+
}
2129
}
2230

2331
}

‎group05/1094051862/test01/src/com/coding1094051862/basic/BinaryTreeNode.java renamed to ‎group05/1094051862/test01/src/com/coding/basic/BinaryTreeNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.coding1094051862.basic;
1+
package com.coding.basic;
22

33
public class BinaryTreeNode {
44

‎group05/1094051862/test01/src/com/coding1094051862/basic/Iterator.java renamed to ‎group05/1094051862/test01/src/com/coding/basic/Iterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.coding1094051862.basic;
1+
package com.coding.basic;
22

33
public interface Iterator {
44
public boolean hasNext();

‎group05/1094051862/test01/src/com/coding1094051862/basic/LinkedList.java renamed to ‎group05/1094051862/test01/src/com/coding/basic/LinkedList.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.coding1094051862.basic;
1+
package com.coding.basic;
22

33
public class LinkedList implements List {
44

@@ -114,16 +114,23 @@ public Object removeLast(){
114114
}
115115
public Iterator iterator(){
116116
return new Iterator() {
117+
int cusor = 0;
118+
Node current = head;
117119
@Override
118120
public Object next() {
119-
// TODO Auto-generated method stub
120-
return null;
121+
if (!hasNext()) {
122+
System.out.println("next : !hasNext");
123+
return null;
124+
}
125+
Object o = current.data;
126+
current = current.next;
127+
cusor ++;
128+
return o;
121129
}
122130

123131
@Override
124132
public boolean hasNext() {
125-
// TODO Auto-generated method stub
126-
return false;
133+
return cusor < size;
127134
}
128135
};
129136
}

‎group05/1094051862/test01/src/com/coding1094051862/basic/LinkedListTest.java renamed to ‎group05/1094051862/test01/src/com/coding/basic/LinkedListTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.coding1094051862.basic;
1+
package com.coding.basic;
22

33
import junit.framework.Assert;
44

@@ -27,6 +27,10 @@ public void test() {
2727
Assert.assertEquals(3, list.get(5));
2828
Assert.assertEquals(4, list.get(6));
2929
Assert.assertEquals(800, list.get(8));
30+
Iterator iterator = list.iterator();
31+
while (iterator.hasNext()) {
32+
System.out.println(iterator.next());
33+
}
3034
}
3135

3236
}

‎group05/1094051862/test01/src/com/coding1094051862/basic/List.java renamed to ‎group05/1094051862/test01/src/com/coding/basic/List.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package com.coding1094051862.basic;
1+
package com.coding.basic;
22

33
public interface List {
44
public void add(Object o);
55
public void add(int index, Object o);
66
public Object get(int index);
77
public Object remove(int index);
88
public int size();
9+
public Iterator iterator();
910
}

‎group05/1094051862/test01/src/com/coding/basic/Queue.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.coding.basic;
2+
3+
public class Queue {
4+
private List list = new ArrayList();
5+
private int size = 0;
6+
public void enQueue(Object o){
7+
list.add(o);
8+
size ++;
9+
}
10+
11+
public Object deQueue(){
12+
if (size == 0)
13+
return null;
14+
size --;
15+
return list.remove(0);
16+
}
17+
18+
public boolean isEmpty(){
19+
return size == 0;
20+
}
21+
22+
public int size(){
23+
return size;
24+
}
25+
}

‎group05/1094051862/test01/src/com/coding/basic/QueueTest.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.coding.basic;
2+
3+
import static org.junit.Assert.*;
4+
import junit.framework.Assert;
5+
6+
import org.junit.Test;
7+
8+
import sun.org.mozilla.javascript.internal.ast.NewExpression;
9+
10+
public class QueueTest {
11+
12+
@Test
13+
public void test() {
14+
Queue queue = new Queue();
15+
for (int i = 0; i < 100; i++) {
16+
queue.enQueue(i);
17+
}
18+
Assert.assertEquals(100, queue.size());
19+
for (int i = 0; i < 100; i++) {
20+
Assert.assertEquals(i, queue.deQueue());
21+
}
22+
Assert.assertEquals(0, queue.size());
23+
24+
}
25+
26+
}

‎group05/1094051862/test01/src/com/coding/basic/Stack.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.coding.basic;
2+
3+
public class Stack {
4+
private List elementData = new ArrayList();
5+
private int size = 0;
6+
public void push(Object o){
7+
elementData.add(o);
8+
size ++;
9+
}
10+
11+
public Object pop(){
12+
if (size == 0)
13+
return null;
14+
return elementData.remove(--size);
15+
}
16+
17+
public Object peek(){
18+
if (size == 0)
19+
return null;
20+
return elementData.get(size - 1);
21+
}
22+
public boolean isEmpty(){
23+
return size == 0;
24+
}
25+
public int size(){
26+
return size;
27+
}
28+
}

‎group05/1094051862/test01/src/com/coding/basic/StackTest.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.coding.basic;
2+
3+
import static org.junit.Assert.*;
4+
import junit.framework.Assert;
5+
6+
import org.junit.BeforeClass;
7+
import org.junit.Test;
8+
9+
public class StackTest {
10+
11+
@Test
12+
public void test() {
13+
Stack stack = new Stack();
14+
for (int i = 0; i < 100; i++) {
15+
stack.push(i);
16+
}
17+
Assert.assertEquals(100, stack.size());
18+
Assert.assertEquals(99, stack.pop());
19+
for (int i = 98; i >= 0; i--) {
20+
Assert.assertEquals(i, stack.peek());
21+
Assert.assertEquals(i, stack.pop());
22+
}
23+
Assert.assertEquals(0, stack.size());
24+
}
25+
26+
}

‎group05/1094051862/test01/src/com/coding1094051862/basic/Queue.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎group05/1094051862/test01/src/com/coding1094051862/basic/Stack.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)