Merge branch 'master' into master

thuva4 · web-flow · commit 6d18d04ca059 · 2017-10-20T13:24:35.000+05:30
diff --git a/BinarySearch/C++/BinarySearch-(iterative).cpp b/BinarySearch/C++/BinarySearch-(iterative).cpp
@@ -11,7 +11,7 @@ int binarySearch(int low,int high,int key)
 {
    while(low<=high)
    {
-     int mid = (low + high) / 2;
+     int mid = low+(high-low)/2;
      if(a[mid] < key)
      {
          low = mid + 1;
diff --git a/HammingDistance/C/HammingDistance.c b/HammingDistance/C/HammingDistance.c
@@ -0,0 +1,22 @@
+#include "string.h"
+
+int HammingDistance(char *str1, char *str2){
+	int i;
+	int dist = 0;
+
+	if(str1 == NULL || str2 == NULL){
+		return -1;
+	}
+	if(strlen(str1) != strlen(str2)){
+		/*Strings must have the same length*/
+		return -1;
+	}
+
+	for(i = 0; i < strlen(str1); i++){
+		if(str1[i] != str2[i]){
+			dist++;
+		}
+	}
+
+	return dist;
+}
diff --git a/LinearSearch/C/LinearSearch.c b/LinearSearch/C/LinearSearch.c
@@ -1,25 +1,16 @@
+#include "stdlib.h"
+int LinearSearch(int *array, int len, int key){
+	int i;
 
-#include <stdio.h>
- 
-int main()
-{
-   int array[100] search, c, n=10; // n is the number of elements to be stored.
-   
-   int array[n]; //array[] is used to store the element
- 
-   printf("Enter the number to search\n");
-   scanf("%d", &search);
- 
-   for (c = 0; c < n; c++)
-   {
-      if (array[c] == search)     /* if required element found */
-      {
-         printf("%d is present at location %d.\n", search, c+1);
-         break;
-      }
-   }
-   if (c == n)
-      printf("%d is not present in array.\n", search);
- 
-   return 0;
+	if(array == NULL){
+		return -1;
+	}
+
+	for(i = 0; i < len; i++){
+		if(array[i] == key){
+			return i;
+		}
+	}
+
+	return -1;
 }
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Fibonacci | :+1: | :+1: |  | :+1: |  |  | :+1: |  | :+1:
 FisherYatesShuffle | :+1: |  |  |  | :+1: | :+1: |  | :+1: |
 Floyd'sAlgorithm | :+1: | :+1: |  |  | :+1: |  |  |  |
 GreatestCommonDivisor | :+1: |  | :+1: | :+1: | :+1: |   |  |  |
-HammingDistance | :+1: | :+1: |  |  |  | :+1: |  |  |
+HammingDistance | :+1: | :+1: |  | :+1: |  | :+1: |  |  |
 HeapSort | :+1: | :+1: |  |  | :+1: | :+1: | :+1: |  | :+1:
 HistogramEqualization | :+1: |  |  |  |  |  |  |  |
 InsertionSort | :+1: | :+1: | :+1: | :+1: | :+1:  |  | :+1: | :+1: |  

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ int binarySearch(int low,int high,int key)`
`11`	`11`	`{`
`12`	`12`	`while(low<=high)`
`13`	`13`	`{`
`14`		`- int mid = (low + high) / 2;`
	`14`	`+ int mid = low+(high-low)/2;`
`15`	`15`	`if(a[mid] < key)`
`16`	`16`	`{`
`17`	`17`	`low = mid + 1;`