Correct formatting and modify methods to be testable

Author: kdimolikas

Algorithms/Search/BinarySearcher.cs

@@ -7,27 +7,24 @@ namespace Algorithms.Search
 {
     public class BinarySearcher<T> : IEnumerator<T>
     {
-
         private readonly IList<T> _collection;
         private readonly Comparer<T> _comparer;
-
+        private T _item;
         private int _currentItemIndex;
         private int _leftIndex;
         private int _rightIndex;
 
         /// <summary>
         /// The value of the current item
         /// </summary>
-        public T Current {
-
+        public T Current
+        {
             get
             {
                 return _collection[_currentItemIndex];
             }
-
         }
 
-
         object IEnumerator.Current => Current;
 
         /// <summary>
@@ -41,59 +38,39 @@ public BinarySearcher(IList<T> collection, Comparer<T> comparer)
             {
                 throw new NullReferenceException("List is null");
             }
+            _collection = collection;
+            _comparer = comparer;
+            HeapSorter.HeapSort(_collection);
+        }
 
-            this._collection = collection;
-            this._comparer = comparer;
-           
+        public void SearchFor(T item)
+        {
+            if (item == null)
+            {
+                throw new NullReferenceException("Item to search for is not set");
+            }
+            Reset();
+            _item = item;
         }
 
-     
         /// <summary>
         /// Apply Binary Search in a list.
         /// </summary>
-        /// <param name="item">The item we search for</param>
         /// <returns>If item found, its' index, -1 otherwise</returns>
-        public int BinarySearch(T item)
+        public int BinarySearch()
         {
-            _currentItemIndex = -1;
-            _leftIndex = 0;
-            _rightIndex = _collection.Count - 1;
-            HeapSorter.HeapSort(_collection);
-            InternalBinarySearch(item);
-            return _currentItemIndex;
-        }
+            bool notFound = true;
 
-
-        /// <summary>
-        /// An implementation of binary search algorithm.
-        /// </summary>
-        /// <param name="item">The item we search for</param>
-        /// <returns></returns>
-        private void InternalBinarySearch(T item)
-        {
-            bool found = false;
-           
-            while (MoveNext() && !found)
+            while ((_leftIndex <= _rightIndex) && notFound)
             {
-                if (_comparer.Compare(item, Current) < 0)
-                {
-                    _rightIndex = _currentItemIndex - 1;
-                }
-                else if (_comparer.Compare(item, Current) > 0)
-                {
-                    _leftIndex = _currentItemIndex + 1;
-                }
-                else
-                {
-                    found = true;
-                }
+                notFound = MoveNext();
             }
-            
-            if (!found)
+
+            if (notFound)
             {
-                this.Reset();
+                Reset();
             }
-
+            return _currentItemIndex;
         }
 
         /// <summary>
@@ -104,23 +81,31 @@ public bool MoveNext()
         {
             _currentItemIndex = this._leftIndex + (this._rightIndex - this._leftIndex) / 2;
 
-            if (_leftIndex <= _rightIndex)
+            if (_comparer.Compare(_item, Current) < 0)
+            {
+                _rightIndex = _currentItemIndex - 1;
+            }
+            else if (_comparer.Compare(_item, Current) > 0)
             {
-                return true;
+                _leftIndex = _currentItemIndex + 1;
             }
             else
             {
                 return false;
             }
-
+            return true;
         }
 
-        
-        public void Reset(){ this._currentItemIndex = -1; }
-
-        
-        public void Dispose(){}
+        public void Reset()
+        { 
+            this._currentItemIndex = -1;
+            _leftIndex = 0;
+            _rightIndex = _collection.Count - 1;
+        }
 
+        public void Dispose()
+        { 
+           //not implementing this, since there are no managed resources to release 
+        }
     }
-
 }