Commit f8398e1

committed

Refactor

1 parent 5b9f2de commit f8398e1Copy full SHA for f8398e1

File tree

+18

-25

lines changed

pom.xml
src
- main/kotlin/pl/dmichalski/algorithms/_9_sorting/quick
  - QuickSortService.kt
- test/groovy/pl/dmichalski/algorithms/_9_sorting/quick
  - QuickSortServiceSpec.groovy

+18

-25

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`<groovy-all.version>2.4.11</groovy-all.version>`
`17`	`17`	`<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>`
`18`	`18`	`<gmavenplus-plugin.version>1.10.0</gmavenplus-plugin.version>`
`19`		`- <kotlin-maven-plugin.jvmTarget>11</kotlin-maven-plugin.jvmTarget>`
	`19`	`+ <kotlin-maven-plugin.jvmTarget>1.8</kotlin-maven-plugin.jvmTarget>`
`20`	`20`	`</properties>`
`21`	`21`
`22`	`22`	`<dependencies>`
`@@ -69,6 +69,7 @@`
`69`	`69`	`</execution>`
`70`	`70`	`</executions>`
`71`	`71`	`</plugin>`
	`72`	`+`
`72`	`73`	`<plugin>`
`73`	`74`	`<groupId>org.jetbrains.kotlin</groupId>`
`74`	`75`	`<artifactId>kotlin-maven-plugin</artifactId>`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,25 @@`
`1`	`1`	`package pl.dmichalski.algorithms._9_sorting.quick`
`2`	`2`
	`3`	`+import pl.dmichalski.algorithms._9_sorting.SortService`
	`4`	`+`
`3`	`5`	`/**`
`4`	`6`	`* Quick sort algorithm.`
`5`	`7`	`*`
`6`	`8`	`* O(n2) time complexity`
`7`	`9`	`* O(n log n) space complexity`
`8`	`10`	`*/`
`9`		`-internal class QuickSortService {`
	`11`	`+internal class QuickSortService : SortService {`
	`12`	`+`
	`13`	`+ override fun sort(values: IntArray): IntArray {`
	`14`	`+ sortArray(values)`
	`15`	`+ return values`
	`16`	`+ }`
`10`	`17`
`11`		`- fun sort(values: IntArray, left: Int? = 0, right: Int? = values.size): IntArray {`
	`18`	`+ privatefun sortArray(values: IntArray, left: Int? = 0, right: Int? = values.size): IntArray {`
`12`	`19`	`if (left!! < right!!) {`
`13`	`20`	`val pivotIndex = pivot(values, left, right)`
`14`		`- sort(values, left, pivotIndex)`
`15`		`- sort(values, pivotIndex + 1, right)`
	`21`	`+ sortArray(values, left, pivotIndex)`
	`22`	`+ sortArray(values, pivotIndex + 1, right)`
`16`	`23`	`}`
`17`	`24`	`return values`
`18`	`25`	`}`

Lines changed: 5 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,12 @@`
`1`	`1`	`package pl.dmichalski.algorithms._9_sorting.quick`
`2`	`2`
`3`		`-import spock.lang.Specification`
`4`		`-import spock.lang.Unroll`
	`3`	`+import pl.dmichalski.algorithms._9_sorting.BaseSortServiceSpec`
`5`	`4`
`6`		`-class QuickSortServiceSpec extends Specification {`
	`5`	`+class QuickSortServiceSpec extends BaseSortServiceSpec {`
`7`	`6`
`8`		`- private final QuickSortService underTest = new QuickSortService()`
	`7`	`+ void setup() {`
	`8`	`+ super.setUnderTest(new QuickSortService())`
`9`	`9`
`10`		`- @Unroll`
`11`		`- def 'should return [expectedResult=#expectedResult] for [values=#values]'() {`
`12`		`- when:`
`13`		`- def result = underTest.sort(values as int[], 0, values.size())`
`14`		`-`
`15`		`- then:`
`16`		`- result == expectedResult as int[]`
`17`		`-`
`18`		`- where:`
`19`		`- values \| expectedResult`
`20`		`- [] \| []`
`21`		`- [1] \| [1]`
`22`		`- [1, 2] \| [1, 2]`
`23`		`- [3, 2, 12, 5] \| [2, 3, 5, 12]`
`24`		`- [1, 2, 10, 12, 4, 5, 1] \| [1, 1, 2, 4, 5, 10, 12]`
`25`		`- [2, 3, 4, 5, 8, 12, 25, 150, 1000, 50] \| [2, 3, 4, 5, 8, 12, 25, 50, 150, 1000]`
`26`	`10`	`}`
	`11`	`+`
`27`	`12`	`}`

Comments

(0)