Skip to content

Commit 11e51f4

Browse files
zoakerczoakerc
committed
解决分支代码冲突
1 parent ee6dc8b commit 11e51f4

File tree

9 files changed

+181
-117
lines changed

9 files changed

+181
-117
lines changed

‎group07/562247675/homework/homework-0226/src/main/java/com/coding2017/group7/homework/c0226/MyArrayList.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,17 @@ public class MyArrayList implements MyList {
88

99
private Object[] elementData = new Object[10];
1010

11-
<<<<<<< HEAD
12-
=======
1311
@Override
14-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
1512
public void add(Object o) {
1613
if (isFull()) {
1714
increase();
1815
}
1916
elementData[size++] = o;
2017
}
2118

22-
<<<<<<< HEAD
23-
public void add(int index, Object o) {
24-
checkRange(index);
25-
=======
2619
@Override
2720
public void add(int index, Object o) {
2821
checkRangeAdd(index);
29-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
3022
if (isFull()) {
3123
increase();
3224
}
@@ -35,22 +27,6 @@ public void add(int index, Object o) {
3527
size++;
3628
}
3729

38-
<<<<<<< HEAD
39-
public Object get(int index) {
40-
checkRange(index);
41-
return elementData[index];
42-
}
43-
44-
public Object remove(int index) {
45-
checkRange(index);
46-
Object element = elementData[index];
47-
System.arraycopy(elementData, index + 1, elementData, index, size - (index + 1));
48-
elementData[size] = null;
49-
size--;
50-
return element;
51-
}
52-
53-
=======
5430
@Override
5531
public Object get(int index) {
5632
checkRangeGet(index);
@@ -67,7 +43,6 @@ public Object remove(int index) {
6743
}
6844

6945
@Override
70-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
7146
public int size() {
7247
return size;
7348
}
@@ -80,27 +55,20 @@ private boolean isFull() {
8055
return size >= elementData.length;
8156
}
8257

83-
<<<<<<< HEAD
84-
private void checkRange(int index) {
85-
=======
8658
private void checkRangeGet(int index) {
87-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
8859
boolean outOfRange = index < 0 || index >= size;
8960
if (outOfRange) {
9061
throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
9162
}
9263
}
9364

94-
<<<<<<< HEAD
95-
=======
9665
private void checkRangeAdd(int index) {
9766
boolean outOfRange = index < 0 || index > size;
9867
if (outOfRange) {
9968
throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
10069
}
10170
}
10271

103-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
10472
private void increase() {
10573
Object[] target = new Object[elementData.length * 2];
10674
System.arraycopy(elementData, 0, target, 0, elementData.length);
@@ -123,10 +91,7 @@ public boolean hasNext() {
12391

12492
@Override
12593
public Object next() {
126-
<<<<<<< HEAD
127-
=======
12894
checkRangeGet(index);
129-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
13095
return elementData[index++];
13196
}
13297
}

‎group07/562247675/homework/homework-0226/src/main/java/com/coding2017/group7/homework/c0226/MyArrayListTest.java

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@
1010
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
1111
public class MyArrayListTest {
1212

13-
<<<<<<< HEAD
14-
private MyArrayList mylist = new MyArrayList();
15-
private final int mysize = 15;
16-
17-
@Before
18-
public void setUp() throws Exception {
19-
for (int i = 0; i < mysize; i++) {
20-
mylist.add(i);
21-
=======
2213
private MyArrayList myList = new MyArrayList();
2314
private Object[] elements = new Object[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
2415
private final int mySize = elements.length;
@@ -27,104 +18,54 @@ public void setUp() throws Exception {
2718
public void setUp() throws Exception {
2819
for (int i = 0; i < mySize; i++) {
2920
myList.add(i, i + 1);
30-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
3121
}
3222
}
3323

3424
@After
3525
public void tearDown() throws Exception {
36-
<<<<<<< HEAD
37-
for (int i = mylist.size(); i > 0; i--) {
38-
mylist.remove(i - 1);
39-
}
40-
mylist = null;
41-
=======
4226
for (int i = myList.size(); i > 0; i--) {
4327
myList.remove(i - 1);
4428
}
4529
myList = null;
46-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
4730
}
4831

4932
@Test
5033
public void addLast() throws Exception {
5134
int element = -1;
52-
<<<<<<< HEAD
53-
mylist.add(element);
54-
Assert.assertEquals(mylist.size(), mysize + 1);
55-
Assert.assertTrue(mylist.get(mylist.size() - 1).equals(element));
56-
=======
5735
myList.add(element);
5836
Assert.assertEquals(myList.size(), mySize + 1);
5937
Assert.assertTrue(myList.get(myList.size() - 1).equals(element));
60-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
6138
}
6239

6340
@Test
6441
public void addIndex() throws Exception {
65-
<<<<<<< HEAD
66-
int index = mysize / 2;
67-
int element = -1;
68-
mylist.add(index, element);
69-
Assert.assertTrue(mylist.get(index).equals(element));
70-
Assert.assertEquals(mylist.size(), mysize + 1);
71-
}
72-
73-
@Test
74-
public void get() throws Exception {
75-
Assert.assertTrue(mylist.get(0).equals(0));
76-
=======
7742
int index = mySize / 2;
7843
int element = -1;
7944
myList.add(index, element);
8045
Assert.assertTrue(myList.get(index).equals(element));
8146
Assert.assertEquals(myList.size(), mySize + 1);
82-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
8347
}
8448

8549
@Test
8650
public void remove() throws Exception {
87-
<<<<<<< HEAD
88-
int index = mysize / 2;
89-
Object before = mylist.get(index + 1);
90-
Object element = mylist.remove(index);
91-
Object after = mylist.get(index);
92-
Assert.assertTrue(before.equals(after));
93-
Assert.assertEquals(mylist.size(), mysize - 1);
94-
=======
9551
int index = mySize / 2;
9652
Object before = myList.get(index + 1);
9753
Object element = myList.remove(index);
9854
Object after = myList.get(index);
9955
Assert.assertTrue(before.equals(after));
10056
Assert.assertEquals(myList.size(), mySize - 1);
101-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
102-
103-
}
10457

105-
@Test
106-
<<<<<<< HEAD
107-
public void size() throws Exception {
108-
Assert.assertEquals(mylist.size(), mysize);
10958
}
11059

11160
@Test
112-
public void iterator() throws Exception {
113-
MyIterator iterator = mylist.iterator();
114-
=======
11561
public void iterator() throws Exception {
11662
MyIterator iterator = myList.iterator();
117-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
11863
int count = 0;
11964
while (iterator.hasNext()) {
12065
iterator.next();
12166
count++;
12267
}
123-
<<<<<<< HEAD
124-
Assert.assertEquals(mylist.size(), count);
125-
=======
12668
Assert.assertEquals(mySize, count);
127-
>>>>>>> 6f77b0da09652d5cbdf03d5d53e197580ced1c5a
12869
}
12970

13071
}

‎group07/562247675/homework/homework-0226/src/main/java/com/coding2017/group7/homework/c0226/MyBinaryTreeNode.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
public class MyBinaryTreeNode {
44

5-
private Object data;
5+
private Comparable data;
66
private MyBinaryTreeNode left;
77
private MyBinaryTreeNode right;
88

9-
public Object getData() {
9+
public Comparable getData() {
1010
return data;
1111
}
1212

13-
public void setData(Object data) {
13+
public void setData(Comparable data) {
1414
this.data = data;
1515
}
1616

@@ -30,8 +30,23 @@ public void setRight(MyBinaryTreeNode right) {
3030
this.right = right;
3131
}
3232

33-
public MyBinaryTreeNode insert(Object o) {
34-
return null;
33+
public MyBinaryTreeNode insert(Comparable o) {
34+
if (data == null) {
35+
data = o;
36+
}
37+
int compare = o.compareTo(data);
38+
if (compare < 0) {
39+
if (left == null) {
40+
left = new MyBinaryTreeNode();
41+
}
42+
left.insert(o);
43+
} else if (compare > 0) {
44+
if (right == null) {
45+
right = new MyBinaryTreeNode();
46+
}
47+
right.insert(o);
48+
}
49+
return this;
3550
}
3651

3752
}

‎group07/562247675/homework/homework-0226/src/main/java/com/coding2017/group7/homework/c0226/MyBinaryTreeNodeTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.coding2017.group7.homework.c0226;
22

33
import org.junit.Assert;
4+
import org.junit.FixMethodOrder;
45
import org.junit.Test;
6+
import org.junit.runners.MethodSorters;
57

8+
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
69
public class MyBinaryTreeNodeTest {
710

811

0 commit comments

Comments
 (0)