Skip to content

homework_04 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions src/main/kotlin/ru/otus/homework/NaturalList.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,28 @@ class NaturalList(n: Int) : List<Int> {
* Вернуть под-список этого списка, включая [fromIndex] и НЕ включая [toIndex]
*/
override fun subList(fromIndex: Int, toIndex: Int): List<Int> {
TODO("Not yet implemented")
if (toIndex <= fromIndex) return this

val subList = mutableListOf<Int>()

for (i in fromIndex..<toIndex) {
subList.add(this[i])
}

return subList
}

/**
* Returns true if list contains all numbers in the collection
*/
override fun containsAll(elements: Collection<Int>): Boolean {
TODO("Not yet implemented")
val set = this.toSet()

elements.forEach {
if (!set.contains(it)) return false
}

return true
}

override fun toString(): String {
Expand All @@ -53,13 +67,31 @@ class NaturalList(n: Int) : List<Int> {
* Функция должна возвращать true, если сравнивается с другой реализацией списка тех же чисел
* Например, NaturalList(5) должен быть равен listOf(1,2,3,4,5)
*/
override fun equals(other: Any?): Boolean = false
override fun equals(other: Any?): Boolean {
if (other is List<*>) {
if (other.size != this.size) return false

for (i in 0..<this.size) if (other[i] != this[i]) return false

return true
} else {
return false
}
}

/**
* Функция должна возвращать тот же hash-code, что и список другой реализации тех же чисел
* Например, NaturalList(5).hashCode() должен быть равен listOf(1,2,3,4,5).hashCode()
*/
override fun hashCode(): Int = -1
override fun hashCode(): Int {
var hashCode = 1

for (element in this) {
hashCode = 31 * hashCode + element.hashCode()
}

return hashCode
}
}

private class NaturalIterator(private val n: Int) : Iterator<Int> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/ru/otus/homework/mapswap/mapSwap.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package ru.otus.homework.mapswap
/**
* Меняет местами ключи и значения
*/
fun <K, V> Map<K, V>.swap(): Map<V, K> = TODO("Доделать swap")
fun <K, V> Map<K, V>.swap(): Map<V, K> = this.entries.associate { (key, value) -> value to key }
4 changes: 2 additions & 2 deletions src/main/kotlin/ru/otus/homework/persons/persons.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package ru.otus.homework.persons
/**
* Отсортировать список персон по возрасту в порядке убывания
*/
fun List<Person>.sortByAge(): List<Person> = TODO("Доделать sortByAge")
fun List<Person>.sortByAge(): List<Person> = sortedByDescending { it.age }

/**
* Отсортировать список персон по фамилии
* - Фамилии сортируются по алфавиту в порядке возрастания
* - Если фамилии совпадают, персоны сортируются по имени в порядке возрастания
*/
fun List<Person>.sortByName(): List<Person> = TODO("Доделать sortBySurname")
fun List<Person>.sortByName(): List<Person> = this.sortedWith(compareBy<Person> { it.surname }.thenBy { it.name })