Skip to content

Commit 36fe8bd

Browse files
committed
Resolve conflicts and integrate binary search into new structure
1 parent 2e579e9 commit 36fe8bd

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

.idea/workspace.xml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/algorithms/searches/binarySearch/BinarySearch.java renamed to src/main/java/algorithms/binarySearch/BinarySearch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package src.algorithms.searches.binarySearch;
1+
package algorithms.binarySearch;
22

33
/** Here, we are implementing BinarySearch where we search an array for a target value at O(log n) time complexity.
44
*

src/algorithms/searches/binarySearch/BinarySearchTemplated.java renamed to src/main/java/algorithms/binarySearch/BinarySearchTemplated.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package src.algorithms.searches.binarySearch;
1+
package algorithms.binarySearch;
22

33
/** Here, we are implementing BinarySearchTemplated where we search an array for a target value at O(log n) time
44
* complexity.

src/algorithms/searches/binarySearch/README.md renamed to src/main/java/algorithms/binarySearch/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ upper or lower half of the current search range.
66
Two versions of binary search has been implemented in this repository - BinarySearch and BinarySearchTemplated.
77

88
## BinarySearch
9-
![binary search img](../../../../assets/BinarySearch.png)
9+
![binary search img](../../../../../assets/BinarySearch.png)
1010
Image Source: GeeksforGeeks
1111

1212
BinarySearch is a more straightforward and intuitive version of the binary search algorithm. In this approach, after the

test/algorithms/binarySearchTest/BinarySearchTest.java renamed to src/test/java/algorithms/binarySearch/BinarySearchTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
package test.algorithms.binarySearchTest;
1+
package algorithms.binarySearch;
22

33
import org.junit.Test;
44

5-
import src.algorithms.searches.binarySearch.BinarySearchTemplated;
6-
import src.algorithms.searches.binarySearch.BinarySearch;
7-
85
import java.util.Arrays;
96

10-
import static org.junit.Assert.assertArrayEquals;
117
import static org.junit.Assert.assertEquals;
128

139
public class BinarySearchTest {

0 commit comments

Comments
 (0)