Skip to content

Commit b7abeb6

Browse files
pwenhuapwenhua
committed
ok
1 parent 1f1276d commit b7abeb6

File tree

3 files changed

+71
-29
lines changed

3 files changed

+71
-29
lines changed

‎group20/2421586846/DS/src/basic/LinkedList.java

+20-25
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ public class LinkedList implements List {
66
private Node head;
77

88
private int size;
9-
public void addError(Object o){
9+
//加到最后
10+
public void add(Object o){
1011
Node newNode= new Node();
1112
newNode.data = o;
1213
newNode.next = null;
@@ -18,34 +19,19 @@ public void addError(Object o){
1819
}
1920

2021
Node currentNode = head;
21-
/*
22+
2223
while (currentNode.next != null ){
2324
currentNode = currentNode.next ;
2425
}
25-
*/
26+
/*
2627
for (int i=0;i< size;i++){
2728
currentNode = currentNode.next ;
2829
}
29-
30+
*/
3031
currentNode.next =newNode;
3132
size++;
3233
}
33-
public void add(Object o){
34-
if (size==0) {
35-
head=new Node();
36-
head.data=o;
37-
size++;
38-
return;
39-
}
40-
Node last=head;
41-
for (int i = 0; i < size-1; i++) {
42-
last=last.next;
43-
}
44-
Node added=new Node();
45-
last.next=added;
46-
added.data=o;
47-
size++;
48-
}
34+
4935
public void add(int index , Object o){
5036
if (index >= size ||index < 0) {
5137
return;
@@ -71,12 +57,13 @@ public void add(int index , Object o){
7157

7258
PrevNode.next = newNode;
7359
newNode.next = currentNode;
74-
}
60+
}
61+
size++;
7562
}
7663

7764
public Object get(int index){
78-
int oldSize = size();
79-
if (index >= oldSize ||index < 0) {
65+
66+
if (index >= size ||index < 0) {
8067
return null;
8168
}
8269
Node currentNode = head;
@@ -87,14 +74,15 @@ public Object get(int index){
8774

8875
}
8976
public Object remove(int index){
90-
int size = size();
77+
9178
if (index >= size ||index < 0) {
9279
return null;
9380
}
9481

9582
Node currentNode = head;
9683
if (index ==0 ){
9784
head =head.next;
85+
size--;
9886
return currentNode.data;
9987
}
10088
Node PrevNode = null;
@@ -103,6 +91,7 @@ public Object remove(int index){
10391
currentNode =currentNode.next;
10492
}
10593
PrevNode.next = currentNode.next;
94+
size--;
10695
return currentNode.data;
10796
}
10897

@@ -120,6 +109,12 @@ public void addFirst(Object o){
120109
size++;
121110
}
122111
public void addLast(Object o){
112+
if (head == null){
113+
head = new Node();
114+
head.data= o;
115+
size ++;
116+
return;
117+
}
123118
Node currentNode = head;
124119
while (currentNode.next != null){
125120
currentNode=currentNode.next;
@@ -142,7 +137,7 @@ public Object removeFirst(){
142137
else {
143138
Node firstNode = head;
144139
head = firstNode.next;
145-
return firstNode;
140+
return firstNode.data ;
146141
}
147142
}
148143
public Object removeLast(){

‎group20/2421586846/DS/src/basic/Queue.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ public void enQueue(Object o){
99

1010

1111
public Object deQueue(){
12-
Object tempObj =elementData.removeFirst();
13-
return tempObj;
12+
return elementData.removeFirst();
1413
}
1514

1615
public boolean isEmpty(){

‎group20/2421586846/DS/src/basic/Test.java

+50-2
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,66 @@
66
public class Test {
77

88
public static void main(String[] args) {
9-
TestLinkedList();
9+
LinkedList ll = new LinkedList();
10+
ll.add(0);
11+
ll.add(1);
12+
ll.add(2);
13+
ll.add(3);
14+
ll.add(4);
15+
16+
LinkedList aa=ll;
17+
ll.add(0,10);
18+
System.out.println(aa.get(0));
1019

20+
}
21+
public static void TestQueue(){
22+
Queue qu= new Queue();
23+
qu.enQueue(1);
24+
qu.enQueue(2);
25+
qu.enQueue(3);
26+
qu.enQueue(4);
27+
qu.enQueue(5);
28+
qu.enQueue(6);
29+
30+
qu.enQueue(7);
31+
qu.enQueue(8);
32+
33+
System.out.println(qu.deQueue());
34+
System.out.println(qu.deQueue());
35+
System.out.println(qu.deQueue());
36+
}
37+
public static void TestStack(){
38+
Stack s = new Stack();
39+
s.push(1);
40+
s.push(2);
41+
s.push(3);
42+
s.push(4);
43+
System.out.println(s.pop());
44+
45+
System.out.println(s.pop());
46+
System.out.println(s.pop());
47+
48+
System.out.println(s.pop());
49+
System.out.println(s.pop());
50+
1151
}
1252
public static void TestLinkedList(){
1353
LinkedList ll = new LinkedList();
54+
ll.add(0);
1455
ll.add(1);
1556
ll.add(2);
1657
ll.add(3);
58+
ll.add(4);
59+
60+
//ll.add(0,5);
61+
//ll.add(0,7);
62+
ll.removeLast();
63+
ll.removeLast();
64+
ll.removeLast();
1765
int size = ll.size();
1866
for (int i=0;i< size;i++){
1967

20-
System.out.println(ll.get(0));
68+
System.out.println(ll.get(i));
2169
}
2270
}
2371

0 commit comments

Comments
 (0)