From b95cb325808d8ce6cf735e177e39cffd05517ae6 Mon Sep 17 00:00:00 2001 From: zhangrui <2411685663@qq.com> Date: Mon, 13 Mar 2017 10:46:46 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/nishuibaichuan/homework/first/List.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/List.java diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/List.java b/group26/2411685663/src/nishuibaichuan/homework/first/List.java new file mode 100644 index 0000000000..cfab8e3522 --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/List.java @@ -0,0 +1,13 @@ +package JEE_2411685663; + +public interface List { + public void add(Object o); + + public void add(int index, Object o); + + public Object get(int index); + + public Object remove(int index); + + public int size(); +} From fdb9d8948576a6bb13b6640b7f3fc7e7ce78857b Mon Sep 17 00:00:00 2001 From: zhangrui <2411685663@qq.com> Date: Mon, 13 Mar 2017 10:52:57 +0800 Subject: [PATCH 02/10] ArrayList --- .../homework/first/ArrayList.java | 123 +++++++++++++++++ .../homework/first/BinaryTreeNode.java | 37 ++++++ .../homework/first/Iterator.java | 9 ++ .../homework/first/LinkedList.java | 125 ++++++++++++++++++ .../nishuibaichuan/homework/first/List.java | 2 +- .../nishuibaichuan/homework/first/Queue.java | 19 +++ .../nishuibaichuan/homework/first/Stack.java | 24 ++++ .../homework/first/TestArrayList.java | 48 +++++++ ...05\345\206\265\347\273\237\350\256\241.md" | 4 +- 9 files changed, 388 insertions(+), 3 deletions(-) create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/ArrayList.java create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/BinaryTreeNode.java create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/Iterator.java create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/LinkedList.java create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/Queue.java create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/Stack.java create mode 100644 group26/2411685663/src/nishuibaichuan/homework/first/TestArrayList.java diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/ArrayList.java b/group26/2411685663/src/nishuibaichuan/homework/first/ArrayList.java new file mode 100644 index 0000000000..efa9ee9bd1 --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/ArrayList.java @@ -0,0 +1,123 @@ +package JEE_2411685663; + +import java.util.Arrays; +import java.util.NoSuchElementException; + +public class ArrayList implements List { + + private static int size = 0; //全局静态变量 + + private Object[] elementData = new Object[100]; + + public void add(Object o) { + isCapacity(size + 1);//判断是否扩容 + elementData[size++] = o; + } + + public void add(int index, Object o) { + checkRangeForAdd(index);//判断下标是否越界 + isCapacity(size + 1); + //使用arraycopy将index下标以后元素后移动 (size - index)长度 + System.arraycopy(elementData, index, elementData, index + 1, size - index); + elementData[index] = o; + size++; + } + + public Object get(int index) { + checkRangeForAdd(index); + return (Object)elementData[index]; + } + + public Object remove(int index) { + checkRangeForAdd(index); + Object oldValue = get(index); + int numMoved = size - index - 1; + if (numMoved > 0) + System.arraycopy(elementData, index+1, elementData, index, + numMoved); + elementData[--size] = null; // index后面数据依次往前移动，将最后一个位置赋值为0，让gc来回收空间。 + return oldValue; + } + + public int size() { + return size; + } + + /** + * 迭代器 + * @return + */ + public Iterator iterator() { + return new SubIterator(this); + } + + private static class SubIterator implements Iterator{ + + private ArrayList arrayList; + private static int ret = 0; + + private SubIterator(){} + + private SubIterator(ArrayList arrayList){ + this.arrayList = arrayList ; + } + + public boolean hasNext() { + return ret != size; + } + + public Object next() { + if (ret > size) { + throw new NoSuchElementException();//没有这样的元素异常 + } + return arrayList.elementData[ret++]; + } + + public void remove() { + arrayList.remove(ret--); + } + + } + + /** + * 下标是否越界 + * @param index + */ + public void checkRangeForAdd(int index){ + if (index < 0 || index > size) { + throw new ArrayIndexOutOfBoundsException("index下标越界" + ", Size: " + size + + ",Index: " + index); + } + } + + /** + * 是否扩容 + */ + public void isCapacity(int size){ + if (size > 100) { + Capacity(size); + } + /** + * size小于0主要是因为当size超过Integer.MAX_VALUE就会变成负数。 + */ + if (size < 0) { + throw new ArrayIndexOutOfBoundsException("数组长度溢出"); + } + } + + public void Capacity(int capacity){ + int newLength = elementData.length + 1000;//再原来基础上扩容1000 + if (newLength - capacity < 0) { + newLength = capacity; //得到最大长度 + } + /** + * 保留了数组的头部信息在数组中，因此实际存放数据的大小就是整数的最大值 - 8 + * 很难执行下面的判断 + */ + if (newLength > Integer.MAX_VALUE - 8) { + newLength = capacity > Integer.MAX_VALUE - 8 ? Integer.MAX_VALUE : Integer.MAX_VALUE - 8; + } + elementData = Arrays.copyOf(elementData, newLength);//获取扩容后的数组 + } + +} diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/BinaryTreeNode.java b/group26/2411685663/src/nishuibaichuan/homework/first/BinaryTreeNode.java new file mode 100644 index 0000000000..17984ab8d1 --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/BinaryTreeNode.java @@ -0,0 +1,37 @@ +package nishuibaichuan.homework.first; + +public class BinaryTreeNode { + + private Object data; + private BinaryTreeNode left; + private BinaryTreeNode right; + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + public BinaryTreeNode getLeft() { + return left; + } + + public void setLeft(BinaryTreeNode left) { + this.left = left; + } + + public BinaryTreeNode getRight() { + return right; + } + + public void setRight(BinaryTreeNode right) { + this.right = right; + } + + public BinaryTreeNode insert(Object o) { + return null; + } + +} diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/Iterator.java b/group26/2411685663/src/nishuibaichuan/homework/first/Iterator.java new file mode 100644 index 0000000000..a0d81a47ba --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/Iterator.java @@ -0,0 +1,9 @@ +package nishuibaichuan.homework.first; + +public interface Iterator { + public boolean hasNext(); + + public Object next(); + + public void remove(); +} diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/LinkedList.java b/group26/2411685663/src/nishuibaichuan/homework/first/LinkedList.java new file mode 100644 index 0000000000..bf38c91470 --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/LinkedList.java @@ -0,0 +1,125 @@ +package nishuibaichuan.homework.first; + +public class LinkedList implements List { + + private Node head; + + public void add(Object o) { + + } + + public void add(int index, Object o) { + + } + + public Object get(int index) { + return null; + } + + public Object remove(int index) { + return null; + } + + public int size() { + return -1; + } + + public void addFirst(Object o) { + + } + + public void addLast(Object o) { + + } + + public Object removeFirst() { + return null; + } + + public Object removeLast() { + return null; + } + + public Iterator iterator() { + return null; + } + + private static class Node { + Object data; + Node next; + + } + + /** + * 把该链表逆置 例如链表为 3->7->10 , 逆置后变为 10->7->3 + */ + public void reverse() { + + } + + /** + * 删除一个单链表的前半部分 例如：list = 2->5->7->8 , 删除以后的值为 7->8 如果list = 2->5->7->8->10 + * ,删除以后的值为7,8,10 + */ + public void removeFirstHalf() { + + } + + /** + * 从第i个元素开始， 删除length 个元素 ， 注意i从0开始 + * + * @param i + * @param length + */ + public void remove(int i, int length) { + + } + + /** + * 假定当前链表和list均包含已升序排列的整数 从当前链表中取出那些list所指定的元素 例如当前链表 = + * 11->101->201->301->401->501->601->701 listB = 1->3->4->6 + * 返回的结果应该是[101,301,401,601] + * + * @param list + */ + public static int[] getElements(LinkedList list) { + return null; + } + + /** + * 已知链表中的元素以值递增有序排列，并以单链表作存储结构。 从当前链表中中删除在list中出现的元素 + * + * @param list + */ + + public void subtract(LinkedList list) { + + } + + /** + * 已知当前链表中的元素以值递增有序排列，并以单链表作存储结构。 删除表中所有值相同的多余元素（使得操作后的线性表中所有元素的值均不相同） + */ + public void removeDuplicateValues() { + + } + + /** + * 已知链表中的元素以值递增有序排列，并以单链表作存储结构。 试写一高效的算法，删除表中所有值大于min且小于max的元素（若表中存在这样的元素） + * + * @param min + * @param max + */ + public void removeRange(int min, int max) { + + } + + /** + * 假设当前链表和参数list指定的链表均以元素依值递增有序排列（同一表中的元素值各不相同） + * 现要求生成新链表C，其元素为当前链表和list中元素的交集，且表C中的元素有依值递增有序排列 + * + * @param list + */ + public LinkedList intersection(LinkedList list) { + return null; + } +} diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/List.java b/group26/2411685663/src/nishuibaichuan/homework/first/List.java index cfab8e3522..ca9279d5fc 100644 --- a/group26/2411685663/src/nishuibaichuan/homework/first/List.java +++ b/group26/2411685663/src/nishuibaichuan/homework/first/List.java @@ -1,4 +1,4 @@ -package JEE_2411685663; +package nishuibaichuan.homework.first; public interface List { public void add(Object o); diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/Queue.java b/group26/2411685663/src/nishuibaichuan/homework/first/Queue.java new file mode 100644 index 0000000000..cf7798678d --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/Queue.java @@ -0,0 +1,19 @@ +package nishuibaichuan.homework.first; + +public class Queue { + + public void enQueue(Object o) { + } + + public Object deQueue() { + return null; + } + + public boolean isEmpty() { + return false; + } + + public int size() { + return -1; + } +} diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/Stack.java b/group26/2411685663/src/nishuibaichuan/homework/first/Stack.java new file mode 100644 index 0000000000..8d9a2f8a0a --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/Stack.java @@ -0,0 +1,24 @@ +package nishuibaichuan.homework.first; + +public class Stack { + private ArrayList elementData = new ArrayList(); + + public void push(Object o) { + } + + public Object pop() { + return null; + } + + public Object peek() { + return null; + } + + public boolean isEmpty() { + return false; + } + + public int size() { + return -1; + } +} diff --git a/group26/2411685663/src/nishuibaichuan/homework/first/TestArrayList.java b/group26/2411685663/src/nishuibaichuan/homework/first/TestArrayList.java new file mode 100644 index 0000000000..b992de37ee --- /dev/null +++ b/group26/2411685663/src/nishuibaichuan/homework/first/TestArrayList.java @@ -0,0 +1,48 @@ +package nishuibaichuan.homework.first; + +import static org.junit.Assert.*; + +import org.junit.Assert; +import org.junit.Test; + +/** + * @Desc: () + * @date: 2017年3月12日 下午7:00:22 + * @email:2411685663@qq.com + */ +@SuppressWarnings("unused") +public class TestArrayList { + + private ArrayList arrayList = new ArrayList(); + + @Test + public void testAll() { + arrayList.add(0); + arrayList.add(1); + arrayList.add(2); + arrayList.add(3); + arrayList.add(4); + arrayList.add(5); + arrayList.add(6); + + Assert.assertEquals(arrayList.size(), 7); + Assert.assertEquals(arrayList.get(1), 1); + System.out.println(arrayList.get(3)); + + arrayList.add(0, 100); + Assert.assertEquals(arrayList.size(), 8); + Assert.assertEquals(arrayList.get(0), 100); + + arrayList.remove(0); + Assert.assertEquals(arrayList.size(), 7); + Assert.assertEquals(arrayList.get(0), 0); + + Iterator iterator = arrayList.iterator(); + while(iterator.hasNext()){ + iterator.next(); + iterator.remove(); + } + Assert.assertEquals(arrayList.size(), 0); + } + +} diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index 8700b37aaf..d88dfe6cb5 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -2,8 +2,8 @@ | -------- | ---------------- | ----- | --------- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | | 抓狂 | 作业1 | 作业2 | 作业3完成100% | | | | | | | | | | 文章1 | | | | | | | | | | -| JEE-逆水百川 | 已完成 | 完成90% | | | | | | | | | -| | 百度 www.baidu.com | | | | | | | | | | +| JEE-逆水百川 | 完成65% | 完成90% | | | | | | | | | +| | http://blog.csdn.net/u012759397/article/details/61618612 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From c574fdb81dc51260f86cb82677b885e41b72cc8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JEE-=E9=80=86=E6=B0=B4=E7=99=BE=E5=B7=9D?= <2411685663@qq.com> Date: Mon, 13 Mar 2017 11:34:37 +0800 Subject: [PATCH 03/10] =?UTF-8?q?Update=2026=E7=BB=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...05\345\206\265\347\273\237\350\256\241.md" | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index d88dfe6cb5..fd3298e6ca 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -1,10 +1,18 @@ -| | | | | | | | | | | | -| -------- | ---------------- | ----- | --------- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | -| 抓狂 | 作业1 | 作业2 | 作业3完成100% | | | | | | | | -| | 文章1 | | | | | | | | | | -| JEE-逆水百川 | 完成65% | 完成90% | | | | | | | | | -| | http://blog.csdn.net/u012759397/article/details/61618612 | | | | | | | | | | -| | | | | | | | | | | | -| | | | | | | | | | | | -| | | | | | | | | | | | -| | | | | | | | | | | | \ No newline at end of file +| | | | | | | +| -------------------- | :-------------------: | ---- | ---- | ---- | ---- | +| 抓狂 | 作业1 | | | | | +| | 文章1 | | | | | +| 723161901 | 已完成 | | | | | +| | | | | | | +| jiaxun1990（89460886） | 已完成 | | | | | +| | https://goo.gl/Wvz3Od | | | | | +| 1515345281 | 已完成 | | | | | +| | | | | | | +| 2070509107 | 已完成 | | | | | +| | | | | | | +| lizhy2017 | 部分完成 | | | | | +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | From b50c6404def0fd74b1cd3875e53ec164ead5c8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JEE-=E9=80=86=E6=B0=B4=E7=99=BE=E5=B7=9D?= <2411685663@qq.com> Date: Mon, 13 Mar 2017 11:36:09 +0800 Subject: [PATCH 04/10] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6945ca9d30..77cdfba900 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,7 @@ rebel.* .rebel.* target +*.DS_Store +liuxin/.DS_Store +liuxin/src/.DS_Store From 3448ce80d88fb88f7e34cfc3fd71ef1ddaca7cd3 Mon Sep 17 00:00:00 2001 From: zhangrui <2411685663@qq.com> Date: Mon, 13 Mar 2017 11:42:34 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...73\204\346\203\205\345\206\265\347\273\237\350\256\241.md" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index fd3298e6ca..a5099325ea 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -12,7 +12,7 @@ | | | | | | | | lizhy2017 | 部分完成 | | | | | | | | | | | | -| | | | | | | -| | | | | | | +| | 部分完成 | | | | | +| JEE-逆水百川 |http://blog.csdn.net/u012759397/article/details/61618612 | | | | | | | | | | | | | | | | | | | From 22607df9d3ab4ef80e4bdd3daf4da635204a1ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JEE-=E9=80=86=E6=B0=B4=E7=99=BE=E5=B7=9D?= <2411685663@qq.com> Date: Mon, 13 Mar 2017 11:42:06 +0800 Subject: [PATCH 06/10] =?UTF-8?q?Update=2026=E7=BB=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...73\204\346\203\205\345\206\265\347\273\237\350\256\241.md" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index a5099325ea..1623bc989e 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -12,7 +12,7 @@ | | | | | | | | lizhy2017 | 部分完成 | | | | | | | | | | | | -| | 部分完成 | | | | | -| JEE-逆水百川 |http://blog.csdn.net/u012759397/article/details/61618612 | | | | | +| JEE-逆水百川 | 部分完成 | | | | | +| |http://blog.csdn.net/u012759397/article/details/61618612 | | | | | | | | | | | | | | | | | | | From dea086c376f4e54d7b670fa173817439127e644d Mon Sep 17 00:00:00 2001 From: zhangrui <2411685663@qq.com> Date: Mon, 13 Mar 2017 12:00:53 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...3\204\346\203\205\345\206\265\347\273\237\350\256\241.md" | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index 1623bc989e..7e2b56b991 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -12,7 +12,4 @@ | | | | | | | | lizhy2017 | 部分完成 | | | | | | | | | | | | -| JEE-逆水百川 | 部分完成 | | | | | -| |http://blog.csdn.net/u012759397/article/details/61618612 | | | | | -| | | | | | | -| | | | | | | + From b8faf31b098d0b545300e84ffa1790d83b13ad96 Mon Sep 17 00:00:00 2001 From: zhangrui <2411685663@qq.com> Date: Mon, 13 Mar 2017 12:11:22 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" | 2 ++ 1 file changed, 2 insertions(+) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index 7e2b56b991..f755900ff2 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -12,4 +12,6 @@ | | | | | | | | lizhy2017 | 部分完成 | | | | | | | | | | | | +| JEE-逆水百川 | 部分完成 | | | | | +| |http://blog.csdn.net/u012759397/article/details/61618612 | | | | | From 72aed923554cc1bb6a5ec971242eec0be51de08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JEE-=E9=80=86=E6=B0=B4=E7=99=BE=E5=B7=9D?= <2411685663@qq.com> Date: Mon, 13 Mar 2017 12:36:21 +0800 Subject: [PATCH 09/10] =?UTF-8?q?Update=2026=E7=BB=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...204\346\203\205\345\206\265\347\273\237\350\256\241.md" | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index f755900ff2..fd3298e6ca 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -12,6 +12,7 @@ | | | | | | | | lizhy2017 | 部分完成 | | | | | | | | | | | | -| JEE-逆水百川 | 部分完成 | | | | | -| |http://blog.csdn.net/u012759397/article/details/61618612 | | | | | - +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | From d0b066bfa08662d64be53b0b20add9f87fadd49e Mon Sep 17 00:00:00 2001 From: BlindingDark <844620174@qq.com> Date: Mon, 13 Mar 2017 13:07:47 +0800 Subject: [PATCH 10/10] =?UTF-8?q?JEE-=E9=80=86=E6=B0=B4=E7=99=BE=E5=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit JEE-逆水百川 作业进度 --- ...05\345\206\265\347\273\237\350\256\241.md" | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" index a1f2d56510..a38b933f0f 100644 --- "a/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" +++ "b/group26/26\347\273\204\346\203\205\345\206\265\347\273\237\350\256\241.md" @@ -1,18 +1,23 @@ -| | | | | | | -| -------------------- | :-------------------: | ---- | ---- | ---- | ---- | -| 抓狂 | 作业1 | | | | | -| | 文章1 | | | | | -| 723161901 | 已完成 | | | | | -| | | | | | | -| jiaxun1990（89460886） | 已完成 | | | | | -| | https://goo.gl/Wvz3Od | | | | | -| 1515345281 | 已完成 | | | | | -| | | | | | | -| 2070509107 | 已完成 | | | | | -| | | | | | | -| lizhy2017 | 部分完成 | | | | | -| | | | | | | -| | | | | | | -| | | | | | | -| | | | | | | -| | | | | | | \ No newline at end of file +| | | | | | | +| -------------------- | :--------------------------------------: | ---- | ---- | ---- | ---- | +| 抓狂 | 作业1 | | | | | +| | 文章1 | | | | | +| 723161901 | 已完成 | | | | | +| | | | | | | +| jiaxun1990（89460886） | 已完成 | | | | | +| | https://goo.gl/Wvz3Od | | | | | +| 1515345281 | 已完成 | | | | | +| | | | | | | +| 2070509107 | 已完成 | | | | | +| | | | | | | +| lizhy2017 | 部分完成 | | | | | +| | | | | | | +| JEE-逆水百川 | 部分完成 | | | | | +| | http://blog.csdn.net/u012759397/article/details/61618612 | | | | | +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | +| | | | | | | \ No newline at end of file