Commit15d0f56

authored

Merge pull requestTheAlgorithms#2 from TheAlgorithms/Development

merging thealgorithms/java to ali4j/java dev branch

2 parents45fee18 +5ec13c6 commit15d0f56Copy full SHA for 15d0f56

File tree

+26

-11

lines changed

+26

-11

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`importcom.types.Sort;`
`4`	`4`
`5`		`-publicclassBubbleSort<T>implementsSort<T> {`
	`5`	`+publicclassBubbleSort<TextendsComparable<T>>implementsSort<T> {`
`6`	`6`	`/**`
`7`	`7`	`* This method implements the Generic Bubble Sort`
`8`	`8`	`*`
`@@ -11,7 +11,7 @@ public class BubbleSort<T> implements Sort<T> {`
`11`	`11`	`**/`
`12`	`12`
`13`	`13`	`@Override`
`14`		`-public<TextendsComparable<T>>T[]sort(T[]array) {`
	`14`	`+publicT[]sort(T[]array) {`
`15`	`15`	`intlast =array.length;`
`16`	`16`	`//Sorting`
`17`	`17`	`booleanswap;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`importjava.util.Iterator;`
`4`	`4`
`5`	`5`	`/**`
`6`		`- * This interface is to definebacis functionality expected out of any implementation class`
	`6`	`+ * This interface is to definebasic functionality expected out of any implementation class`
`7`	`7`	`* Since this is a data structure it should have the flexibility to contain any kind of object hence it has been made generic`
`8`	`8`	`* Any implementation class need not to be thread safe or it could be depending on the implementation class how does it want to behave.`
`9`	`9`	`*`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`packagecom.types;`
`2`	`2`
`3`	`3`	`@FunctionalInterface`
`4`		`-publicinterfaceSort<T> {`
	`4`	`+publicinterfaceSort<TextendsComparable<T>> {`
`5`	`5`
`6`		`-<TextendsComparable<T>>T[]sort(T[]array);`
	`6`	`+T[]sort(T[]array);`
`7`	`7`	`}`

Lines changed: 21 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,32 @@`
`6`	`6`	`classBubbleSortTest {`
`7`	`7`
`8`	`8`	`@Test`
`9`		`-voidbubbleSortTest() {`
`10`		`-BubbleSortbubbleSort =newBubbleSort();`
	`9`	`+voidbubbleSortTestIntegers() {`
	`10`	`+BubbleSort<Integer>bubbleSort =newBubbleSort<>();`
`11`	`11`
`12`		`-Integer[]unsortedInt =newInteger[]{0,5,9,2,1,3,4,8,6,7};`
`13`		`-Integer[]sortedInt =newInteger[]{0,1,2,3,4,5,6,7,8,9};`
	`12`	`+Integer[]unsortedInt = {0,5,9,2,1,3,4,8,6,7};`
	`13`	`+Integer[]sortedInt = {0,1,2,3,4,5,6,7,8,9};`
`14`	`14`	`Assertions.assertArrayEquals(sortedInt,bubbleSort.sort(unsortedInt));`
`15`	`15`
`16`		`-Character[]unsortedChar =newCharacter[]{'f','h','c','a','b','d','g','e'};`
`17`		`-Character[]sortedChar =newCharacter[]{'a','b','c','d','e','f','g','h'};`
	`16`	`+ }`
	`17`	`+`
	`18`	`+@Test`
	`19`	`+voidbubbleSortTestCharacters() {`
	`20`	`+BubbleSort<Character>bubbleSort =newBubbleSort<>();`
	`21`	`+`
	`22`	`+Character[]unsortedChar = {'f','h','c','a','b','d','g','e'};`
	`23`	`+Character[]sortedChar = {'a','b','c','d','e','f','g','h'};`
`18`	`24`	`Assertions.assertArrayEquals(sortedChar,bubbleSort.sort(unsortedChar));`
`19`	`25`
`20`	`26`	`}`
`21`	`27`
	`28`	`+@Test`
	`29`	`+voidbubbleSortTestStrings() {`
	`30`	`+BubbleSort<String>bubbleSort =newBubbleSort<>();`
	`31`	`+`
	`32`	`+String[]unsortedChar = {"abc","adc","bcd","abb","abc","acb"};`
	`33`	`+String[]sortedChar = {"abb","abc","abc","acb","adc","bcd"};`
	`34`	`+Assertions.assertArrayEquals(sortedChar,bubbleSort.sort(unsortedChar));`
	`35`	`+`
	`36`	`+ }`
`22`	`37`	`}`

Comments

(0)