Gitignores changed for some reason. SortSearch updated

AlexNPavel · Apr 29, 2015 · 770aaf0 · 770aaf0
1 parent 65b6f38
commit 770aaf0
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 26 deletions.
diff --git a/APCompSciStuffSince Oct13/bin/.gitignore b/APCompSciStuffSince Oct13/bin/.gitignore
diff --git a/Arraylists/bin/.gitignore b/Arraylists/bin/.gitignore
diff --git a/ClassConcepts/bin/.gitignore b/ClassConcepts/bin/.gitignore
diff --git a/ColorProject/bin/.gitignore b/ColorProject/bin/.gitignore
diff --git a/ColorProject_01/bin/.gitignore b/ColorProject_01/bin/.gitignore
diff --git a/HeapGame/bin/.gitignore b/HeapGame/bin/.gitignore
diff --git a/HeapGame_NoSync/bin/.gitignore b/HeapGame_NoSync/bin/.gitignore
diff --git a/HeapGame_Wait_Notify/bin/.gitignore b/HeapGame_Wait_Notify/bin/.gitignore
diff --git a/Integral Calculator/bin/.gitignore b/Integral Calculator/bin/.gitignore
diff --git a/Integral_Calculator/bin/.gitignore b/Integral_Calculator/bin/.gitignore
diff --git a/JavaApplication1/bin/.gitignore b/JavaApplication1/bin/.gitignore
diff --git a/Matrix/bin/.gitignore b/Matrix/bin/.gitignore
diff --git a/Midterm/bin/.gitignore b/Midterm/bin/.gitignore
diff --git a/Player/bin/.gitignore b/Player/bin/.gitignore
diff --git a/Sep 5/bin/.gitignore b/Sep 5/bin/.gitignore
diff --git a/Sep9/bin/.gitignore b/Sep9/bin/.gitignore
diff --git a/SortSearch/bin/.gitignore b/SortSearch/bin/.gitignore
diff --git a/SortSearchClean/src/SortSearch.java b/SortSearchClean/src/SortSearch.java
@@ -15,6 +15,7 @@ public class SortSearch {
 	static long time2;
 	int tempShift;
 	boolean reset;
+	boolean exists;
 
 	public SortSearch(int length) {
 		reset = true;
@@ -320,7 +321,7 @@ public boolean linearSearch(int[] sortArr, int key) {
 	}
 
 	public boolean binarySearch(int[] sortArr, int key) {
-		boolean exists = false;
+		exists = false;
 		mergeR(sortArr, 0, sortArr.length - 1);
 		System.out.println("Sorted array is: "+ Arrays.toString(sortArr));
 		int begin = 0 ;
@@ -346,6 +347,9 @@ else if (sortArr[mid] > key) {
 			}
 
 			if(!((end - begin) > 0)) {
+				if (sortArr[begin] == key) {
+					exists = true;
+				}
 				System.out.println("Breaking with begin "+ begin +" and end "+ end);
 				break;
 			}
@@ -354,9 +358,39 @@ else if (sortArr[mid] > key) {
 		return exists;
 	}
 
-	public void binarySearch(int[] sortArr, int key, int first, int last) {
-		mergeR(sortArr, 0, sortArr.length - 1);
-
+	public boolean binarySearch(int[] sortArr, int key, int first, int last) {
+		exists = false;
+		System.out.println("Sorted array is: "+ Arrays.toString(sortArr));
+		int begin = first ;
+		int end  = last;
+		int mid = ((end - begin) / 2) + begin;
+		if(!((end - begin) > 0)) {
+			if (sortArr[begin] == key) {
+				exists = true;
+			}
+			System.out.println("Breaking with begin "+ begin +" and end "+ end);
+			return exists;
+		}
+		else {
+			System.out.println("Checking " + sortArr[mid] + " against " + key);
+			System.out.println("Begin is " + begin + " end is "+ end);
+			if (sortArr[mid] < key) {
+				System.out.println("In less than");
+				begin = mid + 1;
+				binarySearch(sortArr, key, begin, end);
+			}
+			else if (sortArr[mid] > key) {
+				System.out.println("In greater than");
+				end = mid - 1;
+				binarySearch(sortArr, key, begin, end);
+			}
+			else {
+				System.out.println("In exists");
+				exists = true;
+				return true;
+			}
+		}
+		return exists;
 	}
 
 	public static void main(String[] args) {
@@ -486,17 +520,33 @@ public static void main(String[] args) {
 		//		System.out.println("QuickSort "+(time2 - time));
 		//				System.out.println("My sorted array is " + Arrays.toString(myStuff));
 
+		int randNum;
+
+//		for (int i = 0; i < myStuff.length; i++) {
+//			myStuff[i] = new Random().nextInt(maxInt);
+//		}
+//		System.out.println("Initial array was " + Arrays.toString(myStuff) + "\n");
+//		randNum = new Random().nextInt(maxInt);
+//		if (sorter.binarySearch(myStuff, randNum)) {
+//			System.out.println("Value " + randNum + " exists in array");
+//		}
+//		else{
+//			System.out.println("Value " + randNum + " does not exist in array");
+//		}
+
 		for (int i = 0; i < myStuff.length; i++) {
 			myStuff[i] = new Random().nextInt(maxInt);
 		}
 		System.out.println("Initial array was " + Arrays.toString(myStuff) + "\n");
-		int randNum = new Random().nextInt(maxInt);
-		if (sorter.binarySearch(myStuff, randNum)) {
+		sorter.mergeR(myStuff, 0, myStuff.length - 1);
+		randNum = new Random().nextInt(maxInt);
+		if (sorter.binarySearch(myStuff, randNum, 0, myStuff.length - 1)) {
 			System.out.println("Value " + randNum + " exists in array");
 		}
 		else{
 			System.out.println("Value " + randNum + " does not exist in array");
 		}
+
 	}
 
 }
diff --git a/TestSenior/bin/.gitignore b/TestSenior/bin/.gitignore