[Bug fix]

1.Fix the bug of not checking the boundary of the array.
2.Add some functions in get iterable symbol table.

Author: Seanforfun

Algorithm(4th_Edition)/algorithm_note.txt

@@ -175,7 +175,17 @@
 			return t;
 		}
 		public Boolean isEmpty() { return size.equals(0); }
-		public Integer size() { return size; }				
+		public Integer size() { return size; }
+		public Iterator<T> iterator() {
+			return new ListFIFOQueueIterator<T>();
+		}
+		
+		private class ListFIFOQueueIterator<T> implements Iterator<T>{
+			public boolean hasNext() {	return size > 0;	}
+			public T next() {		return (T) dequeue();	}
+			public void remove() {
+			}
+		}		
 	}
 
 11. 栈 LIFO队列：
@@ -821,26 +831,69 @@
 
 	二分法实现类：
 	实现：ca.mcmaster.chapter.three.BinarySearchST<K, V>
-	public class BinarySearchST<K extends Comparable<K>, V> extends SearchSTAbstract<K, V> {
-		public BinarySearchST(int capacity) {	super(capacity);		}
-		public int binarySearch(K k) {
-			int lo = 0, hi = N - 1;
-			while(lo <= hi){
-				int mid = lo + (hi - lo) / 2;
-				int cmp = keys[mid].compareTo(k);
-				if(cmp < 0)				lo = mid + 1;
-				else if(cmp > 0) 		hi = mid - 1;
-				else return mid;
+	public abstract class SearchSTAbstract<K extends Comparable<K>, V> {
+		protected K[] keys;
+		protected V[] values;
+		protected int N;
+		public SearchSTAbstract(int capacity){
+			keys = (K[]) new Comparable[capacity];
+			values = (V[]) new Object[capacity];
+		}
+		public int size()	{	return N;		}
+		public V get(K k){
+			if(isEmpty())	return null;
+			int i = binarySearch(k);
+			if(i < N && keys[i].compareTo(k) == 0)	return values[i];
+			else												return null;
+		}
+		public void put(K k, V v){
+			int i = binarySearch(k);
+			if(i < N && keys[i].compareTo(k) == 0){
+				values[i] = v;	return;
 			}
-			return lo;
-		}
-		public Integer traditionalBinarySearch(K k, int lo, int hi){
-			if(lo > hi) return lo;
-			int mid = lo + (hi - lo) / 2;
-			int cmp = keys[mid].compareTo(k);
-			if(cmp > 0) return traditionalBinarySearch(k, lo, mid - 1);
-			else if(cmp < 0) return traditionalBinarySearch(k, mid + 1, hi);
-			else return mid;
+			for(int j = N; j > i; j--){
+				keys[j] = keys[j-1];
+				values[j] = values[j-1];
+			}
+			keys[i] = k;
+			values[i] = v;
+			N++;
+		}
+		public Boolean isEmpty()	{	return N == 0;	}
+		public abstract int binarySearch(K k);
+		public void delete(K k){
+			int i = binarySearch(k);
+			if(i < N && keys[i].compareTo(k) == 0){
+				for(int j = i; j < N; j++){
+					keys[j] = keys[j+1];
+					values[j] = values[j+1];
+				}
+				keys[N] = null;
+				values[N] = null;
+				N--;
+			}
+		}
+		public K min(){	return keys[0];	}
+		public K max(){	return keys[N-1];	}
+		public K select(int k){	return 	keys[k];	}
+		public K ceiling(K k){
+			int i = binarySearch(k);
+			return keys[i];
+		}
+		public Iterable<K> keys(int lo, int hi){
+			if(lo > hi)		return null;
+			if(hi >= N	)	throw new ArrayIndexOutOfBoundsException();
+			ListFIFOQueue<K> queue = new ListFIFOQueue<>();
+			for(int i = binarySearch(keys[lo]); i < binarySearch(keys[hi]); i++){
+				queue.enqueue(keys[i]);
+				System.out.println(i);
+			}
+			if(contains(keys[hi]))	queue.enqueue(keys[hi]);
+			return queue;
+		}
+		public Boolean contains(K k){
+			int i = binarySearch(k);
+			return i < N;
 		}
 	}
 	传统二分法：

Algorithm(4th_Edition)/src/ca/mcmaster/chapter/three/BinarySearchST.java

@@ -33,7 +33,7 @@ public static void main(String[] args) {
 		System.out.println(table.get("d"));
 		table.delete("d");
 		System.out.println(table.get("d"));
-		Iterable<String> queue = table.keys(0, 3);
+		Iterable<String> queue = table.keys(0, 2);
 		Iterator<String> it = queue.iterator();
 		while (it.hasNext()) {
 			System.out.println(it.next());

Algorithm(4th_Edition)/src/ca/mcmaster/chapter/three/SearchSTAbstract.java

@@ -53,6 +53,7 @@ public K ceiling(K k){
 	}
 	public Iterable<K> keys(int lo, int hi){
 		if(lo > hi)		return null;
+		if(hi >= N	)	throw new ArrayIndexOutOfBoundsException();
 		ListFIFOQueue<K> queue = new ListFIFOQueue<>();
 		for(int i = binarySearch(keys[lo]); i < binarySearch(keys[hi]); i++){
 			queue.enqueue(keys[i]);