Arrays: FindArray - refactoring.

rpanjrath · rpanjrath · commit 6ef479295ba6 · 2014-02-06T11:06:18.000-08:00
diff --git a/src/arrays/findarray/FindArrayImpl.java b/src/arrays/findarray/FindArrayImpl.java
@@ -15,16 +15,18 @@ public int findArray(int[] array, int[] subArray) {
         }
         int subArrayFirstElement = subArray[0];
         int startIndex = -1;
-        for (int i = 0; i < array.length; i++) {
+        int i = 0;
+        while (i < array.length) {
             if (array[i] == subArrayFirstElement) {
                 if (subArray.length == 1) {
                     startIndex = i;
                     return startIndex;
                 }
                 int j = i + 1;
-                int k = 1;
+                int k = 1;  // k is to keep track of sub-array index.
                 while (j < array.length && k < subArray.length) {
                     if (array[j] != subArray[k]) {
+                        i = j;
                         break;
                     }
                     if (k == subArray.length - 1) {
@@ -34,6 +36,8 @@ public int findArray(int[] array, int[] subArray) {
                     j++;
                     k++;
                 }
+            } else {
+                i++;
             }
         }
         return startIndex;
@@ -42,6 +46,8 @@ public int findArray(int[] array, int[] subArray) {
     public static void main(String[] args) {
         FindArray findArray = new FindArrayImpl();
 
-        System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8 , 9 , 1,10}, new int[]{8, 9, 10}));
+        System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8, 9, 1, 10}, new int[]{8, 9, 10}));
+        System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8, 9, 10}, new int[]{8, 9, 10}));
+        System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8, 9, 8, 9, 10}, new int[]{8, 9, 10}));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,18 @@ public int findArray(int[] array, int[] subArray) {`
`15`	`15`	`}`
`16`	`16`	`int subArrayFirstElement = subArray[0];`
`17`	`17`	`int startIndex = -1;`
`18`		`- for (int i = 0; i < array.length; i++) {`
	`18`	`+ int i = 0;`
	`19`	`+ while (i < array.length) {`
`19`	`20`	`if (array[i] == subArrayFirstElement) {`
`20`	`21`	`if (subArray.length == 1) {`
`21`	`22`	`startIndex = i;`
`22`	`23`	`return startIndex;`
`23`	`24`	`}`
`24`	`25`	`int j = i + 1;`
`25`		`- int k = 1;`
	`26`	`+ int k = 1; // k is to keep track of sub-array index.`
`26`	`27`	`while (j < array.length && k < subArray.length) {`
`27`	`28`	`if (array[j] != subArray[k]) {`
	`29`	`+ i = j;`
`28`	`30`	`break;`
`29`	`31`	`}`
`30`	`32`	`if (k == subArray.length - 1) {`
`@@ -34,6 +36,8 @@ public int findArray(int[] array, int[] subArray) {`
`34`	`36`	`j++;`
`35`	`37`	`k++;`
`36`	`38`	`}`
	`39`	`+ } else {`
	`40`	`+ i++;`
`37`	`41`	`}`
`38`	`42`	`}`
`39`	`43`	`return startIndex;`
`@@ -42,6 +46,8 @@ public int findArray(int[] array, int[] subArray) {`
`42`	`46`	`public static void main(String[] args) {`
`43`	`47`	`FindArray findArray = new FindArrayImpl();`
`44`	`48`
`45`		`- System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8 , 9 , 1,10}, new int[]{8, 9, 10}));`
	`49`	`+ System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8, 9, 1, 10}, new int[]{8, 9, 10}));`
	`50`	`+ System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8, 9, 10}, new int[]{8, 9, 10}));`
	`51`	`+ System.out.println(findArray.findArray(new int[]{7, 8, 9, 11, 8, 9, 8, 9, 10}, new int[]{8, 9, 10}));`
`46`	`52`	`}`
`47`	`53`	`}`