Merge pull request #55 from GUK0/master

添加第6周作业文件

group12/247565311/week1/ArrayList.java → group12/247565311/structure/week1/ArrayList.java

@@ -1,8 +1,10 @@
-package week1;
+package structure.week1;
 
 import java.util.Collection;
 
-public class ArrayList<E> implements List<E> {
+import structure.week1.List;
+
+public class ArrayList<E>{
 	private int size=0,offset=10;
 	private Object[] data = null;
     public ArrayList(){
@@ -13,7 +15,7 @@ public ArrayList(int arg0){
     	size = arg0;
     	data = new Object[size];
     }
-	@Override
+
 	public void add(Object arg0) {
 		size += 1;
 		int leng = data.length;
@@ -27,8 +29,7 @@ public void add(Object arg0) {
 		data[size-1] = arg0;
 	}
 
-	@Override
-	public void add(int arg0, E arg1) {
+    public void add(int arg0, E arg1) {
 		if( arg0>size || 0<arg0) return ;
 		size += 1;
 		int leng = data.length;
@@ -106,7 +107,6 @@ public boolean containsAll(Collection<?> arg0) {
 		return true;
 	}
 
-	@Override
 	public E get(int arg0) {
         if(arg0 >-1 && arg0<this.size) return (E)data[arg0];
 		return null;
@@ -145,7 +145,6 @@ public boolean remove(Object arg0) {
 		return false;
 	}
 
-	@Override
 	public E remove(int arg0) {
 		if(arg0<0 ||arg0>this.size-1) return null;
 		E res = (E)data[arg0];
@@ -174,22 +173,9 @@ public E set(int arg0, E arg1) {
 		return arg1;
 	}
 
-	@Override
 	public int size() {
 		return this.size;
 	}
-
-	public List<E> subList(int arg0, int arg1) {
-		if(arg0>=arg1 || arg0<0 || arg1>this.size-1) return null;
-		List<E> res = new ArrayList<E>();
-		for(int i=arg0;i<arg1;i++){
-			// 如何获取拷贝？
-
-
-		}
-
-		return null;
-	}
 //////////////////////////////////////////////
 	public Object[] toArray() {
 		if(this.size == 0) return null;
@@ -207,12 +193,10 @@ public <T> T[] toArray(T[] arg0) {
 		}
 		return res;
 	}
-	@Override
 	public boolean hasNext() {
 		// TODO 自动生成的方法存根
 		return false;
 	}
-	@Override
 	public Object next() {
 		// TODO 自动生成的方法存根
 		return null;

group12/247565311/week1/BinaryTreeNode.java → group12/247565311/structure/week1/BinaryTreeNode.java

@@ -1,4 +1,4 @@
-package week1;
+package structure.week1;
 
 public class BinaryTreeNode {
 

group12/247565311/week1/Iterator.java → group12/247565311/structure/week1/Iterator.java

@@ -1,4 +1,4 @@
-package week1;
+package structure.week1;
 
 public interface Iterator <E>{
 	public boolean hasNext();

group12/247565311/week1/LinkedList.java → group12/247565311/structure/week1/LinkedList.java

@@ -1,8 +1,8 @@
-package week1;
+package structure.week1;
 
 import java.util.Collection;
 
-public class LinkedList<E> implements List<E> {
+public class LinkedList<E> {
 	private Node head = null;
 	private Node tail = null;
 	private int size = 0;
@@ -36,7 +36,6 @@ public Object clone(){
 		}
 		return clone;
 	}
-	@Override
 	public void add(Object val) {
 		Node n = new Node(val);
 		n.next = tail;
@@ -46,7 +45,6 @@ public void add(Object val) {
 		size += 1;
 	}
 
-	@Override
 	public void add(int arg0, E arg1) {
 		if(arg0<0 || arg0>size) arg0=0;
 		Node n=new Node(arg1),p=head;
@@ -104,7 +102,6 @@ public boolean containsAll(Collection<?> arg0) {
 		return true;
 	}
 
-	@Override
 	public E get(int arg0) {
 		E res = null;
         if(arg0>-1 && arg0 < size){
@@ -167,7 +164,6 @@ public boolean remove(Object arg0) {
 		return true;
 	}
 
-	@Override
 	public E remove(int arg0) {
         Node n = head;
         if(arg0 <0 || arg0>size-1) return null;
@@ -202,7 +198,6 @@ public E set(int arg0, E arg1) {
 		return (E)(n.next.val);
 	}
 
-	@Override
 	public int size() {
 		return size;
 	}
@@ -231,11 +226,11 @@ private static class Node{
 		Node next = null,ahead=null;
 		public Node(Object arg0){val = arg0;}
 	}
-	@Override
+
 	public boolean hasNext() {
 		return false;
 	}
-	@Override
+
 	public Object next() {
 		return null;
 	}

group12/247565311/week1/List.java → group12/247565311/structure/week1/List.java

@@ -1,9 +1,9 @@
-package week1;
+package structure.week1;
 
 public interface List<E> extends Iterator{
 	public void add(Object o);
-	public void add(int index, E o);
 	public E get(int index);
 	public E remove(int index);
 	public int size();
+	void add(int arg0, E arg1);
 }

group12/247565311/week1/Queue.java → group12/247565311/structure/week1/Queue.java

@@ -1,4 +1,4 @@
-package week1;
+package structure.week1;
 public class Queue<E> {
      private LinkedList<E> data = new LinkedList<E>();
      public void enQueue(E arg0){

group12/247565311/week1/Stack.java → group12/247565311/structure/week1/Stack.java

@@ -1,6 +1,6 @@
-package week1;
+package structure.week1;
 
-import week1.List;
+import structure.week1.List;
 
 public class Stack<E> {
     private ArrayList<E> data = new ArrayList<E>();

group12/247565311/week2/ArrayUtil.java → group12/247565311/structure/week2/ArrayUtil.java

@@ -1,5 +1,5 @@
-package week2;
-import week1.ArrayList;
+package structure.week2;
+import structure.week1.ArrayList;
 
 public class ArrayUtil {
 

group12/247565311/week2/ArrayUtilTest.java → group12/247565311/structure/week2/ArrayUtilTest.java

@@ -1,4 +1,4 @@
-package week2;
+package structure.week2;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;

group12/247565311/week3/LinkedList.java → group12/247565311/structure/week3/LinkedList.java

@@ -1,10 +1,10 @@
-package week3;
+package structure.week3;
 
 
 import java.util.NoSuchElementException;
 
-import week1.Iterator;
-import week1.List;
+import structure.week1.Iterator;
+import structure.week1.List;
 
 public class LinkedList implements List {
 	private Node head = new Node();

group12/247565311/week3/LinkedListTest.java → group12/247565311/structure/week3/LinkedListTest.java

@@ -1,4 +1,4 @@
-package week3;
+package structure.week3;
 
 import static org.junit.Assert.*;
 

group12/247565311/week5/LRU.java → group12/247565311/structure/week5/LRUPageFrame.java

@@ -1,8 +1,8 @@
-package week5;
+package structure.week5;
 import java.util.HashSet;
 
-import week1.ArrayList;
-public class LRU {
+import structure.week1.ArrayList;
+public class LRUPageFrame {
 	int size;
 	Node head = new Node(0);
 	HashSet<Integer> lib = new HashSet<Integer>();
@@ -14,7 +14,7 @@ public Node(int _val){
 			next = null;
 		}
 	}
-    public LRU(int _size){
+    public LRUPageFrame(int _size){
     	if(_size>0) {
     		this.size = _size;
     	}

group12/247565311/week5/LRUTest.java → group12/247565311/structure/week5/LRUPageFrameTest.java

@@ -1,4 +1,4 @@
-package week5;
+package structure. week5;
 
 import static org.junit.Assert.*;
 
@@ -7,7 +7,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class LRUTest {
+public class LRUPageFrameTest {
 
 	@Before
 	public void setUp() throws Exception {
@@ -19,7 +19,7 @@ public void tearDown() throws Exception {
 
 	@Test
 	public void testAdd() {
-        LRU lru = new LRU(5);
+        LRUPageFrame lru = new LRUPageFrame(5);
         lru.add(3);
         lru.add(7);
         lru.add(5);