Finish line is just by the corner.

-Although testing need to occur, seems that the project is now finished.
-Implemented searchPage in BinaryFileSearch class (see BinaryFileSearch.java).

Author: apfel-das

src/searchOps/BinaryFileSearch.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 
 import Files.FilePageAccess;
 import util.Word;
@@ -28,10 +29,91 @@ public BinaryFileSearch(FilePageAccess f)
 
 
 
+	/*
+	 * An iterative binary search should expose any keys matching the given one.
+	 * 
+	 * */
 	@Override
-	public void searchPage(String k)
+	public void searchPage(String key)
 	{
 
+	
+		//structures to assist.
+		ArrayList<Word> tokens;
+		found = new ArrayList<Word>();
+		
+		//a flag to mark finding event.
+		boolean isFound = false;
+		
+		//define right and left parts.
+		int left = 0;
+		int right = filePages;
+		int mid = left +(right-left)/2;
+		
+		//parse pages, distinguish the middle to be accesed.
+		while(left <= right && isFound == false) 
+		{
+		
+			
+			
+			System.out.println("Loading Page: "+mid);
+			
+			//load the middle page
+			
+			tokens = loadPage(mid+1);
+			
+			//parse it to seek for the key
+			for(int i =0; i < tokens.size(); i++) 
+			{
+				//check for equality, then append.
+				if(tokens.get(i).getContext().compareTo(key) == 0) 
+				{
+					found.add(tokens.get(i));
+					
+					//last element of any page might have another occurrence on next page.
+					if((i == tokens.size() - 1) || i == 0)
+						isFound = false;
+					else
+						isFound = true;
+				}
+			}
+			
+			//adjust the new middle position.
+			if(!isFound) 
+			{
+				String first = tokens.get(0).getContext();
+				String last = tokens.get(tokens.size()-1).getContext();
+				
+				
+				if(!(key.compareTo(first) > 0)) 
+				{
+					right = mid - 1;
+					/*
+					 * Debug Lines
+					 * */
+					//System.out.println("<-");
+				}
+				else if(!(key.compareTo(last) < 0)) 
+				{
+				
+					left = mid + 1;
+					/*
+					 * Debug Lines.
+					 * 
+					 * */
+					//System.out.println("->");
+				}
+				else 
+				{
+					//key is not on the given file. yet we mark the finding event to finish searching.
+					isFound = true;
+				}
+				
+			}
+			mid = left +(right-left)/2;
+			
+		}
+		
 
 
 	}
@@ -57,9 +139,35 @@ public ArrayList<Word> loadPage(int n)
 	}	
 
 	@Override
-	public void print() {
-		// TODO Auto-generated method stub
+	public void print() 
+	{
+		
+		if(found.size() > 0) 
+		{
+		
+			Collections.sort(found);
+			//print the key.
+			System.out.print("\""+found.get(0).getContext()+"\""+" is on lines: ");
+			
+			//print the lines.
+			for(int i = 0; i < found.size(); i++) 
+			{
+				System.out.print(found.get(i).getLine());
+				if((i+1) != found.size())
+					System.out.print(", ");
+			}
+			//print disk accesses.
+			
+			System.out.format("\nDisk Accesses: %s \n",this.diskAccess);
+			
+		}
+		else
+			System.out.println("Key not found");
+		
 
 	}
+	
+	 
+	
 
 }

src/test/Main.java

@@ -246,11 +246,20 @@ private static void execCommand(Session u, List lines,Scanner input, FileOps f,F
 
 				SerialFileSearch sfs = new SerialFileSearch(fpa);
 
+				
 				System.out.print("Type word for search: ");
 				sfs.searchPage(input.nextLine().trim());
 				sfs.print();
+				break;
 
-			
+			case "b":
+				
+				BinaryFileSearch bfs = new BinaryFileSearch(fpa);
+				System.out.print("Type word for search: ");
+				bfs.searchPage(input.nextLine().trim());
+				bfs.print();
+				
+				break;
 
 
 
@@ -272,7 +281,7 @@ private static String inputCheck(String inp)
 
 		//using a regex to check input and another one to check whether to print message to user or not.
 		String valid = "[atdlnpqwxcvsb=#\\-\\$\\^\\+]"; 
-		String printable = "[scvlp=#]"; 
+		String printable = "[bscvlp=#]"; 
 
 		Matcher m = Pattern.compile(valid).matcher(inp);
 		Matcher mp = Pattern.compile(printable).matcher(inp);

src/util/Word.java

@@ -35,13 +35,25 @@ public void setLine(int line) {
 
 
 
+	/*	
+	 * Sorting by line if context is the same,else by context <String>, this is to enable sorting by line in BinaryFileSearch.java.
+	 *	
+	 * It has no effect on sorting by actual context if given strings are different.
+	 *
+	 */
+	
 	@Override
 	public int compareTo(Word w) {
-		return this.context.compareTo(w.getContext()); 
+		
+		int line = this.context.compareTo(w.getContext());
+		
+		
+		return line == 0 ? this.line - w.getLine() : line; 
 
 	}
 
 
+