Skip to content

Done #55

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

Done #55

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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.9.10'
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
}

test {
Expand Down
42 changes: 38 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,22 @@ class NaturalList(n: Int) : List<Int> {
* Вернуть под-список этого списка, включая [fromIndex] и НЕ включая [toIndex]
*/
override fun subList(fromIndex: Int, toIndex: Int): List<Int> {
TODO("Not yet implemented")
val result = mutableListOf<Int>()
for (i in fromIndex until toIndex) {
result.add(this[i])
}
return result
}

/**
* Returns true if list contains all numbers in the collection
*/
override fun containsAll(elements: Collection<Int>): Boolean {
TODO("Not yet implemented")
/** return elements.all { it in this } или */
elements.forEach {
if (!this.contains(it)) return false
}
return true
}

override fun toString(): String {
Expand All @@ -53,13 +61,39 @@ 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 (this === other) return true
if (other !is List<*>) return false
return this.size == other.size
}


/**
* Функция должна возвращать тот же hash-code, что и список другой реализации тех же чисел
* Например, NaturalList(5).hashCode() должен быть равен listOf(1,2,3,4,5).hashCode()
*/
override fun hashCode(): Int = -1
override fun hashCode(): Int {
/**
* Hashcode is calculated using below formula
*
* s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[0]
*
* where:
*
* s is ith character in the string
* n is length of the string
*
*/
/**
* Нашел описание для строки, оставлю на всякий. Не нашел для целочисленного списка,
* подсмотрел у соседей
*/
var hash = 1
for (i in this) {
hash = 31 * hash + i.hashCode()
}
return hash
}
}

private class NaturalIterator(private val n: Int) : Iterator<Int> {
Expand Down
15 changes: 14 additions & 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,17 @@ 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> = entries.associate { (k, v) -> v to k }


fun main() {
val m = mapOf(
1 to "one",
2 to "two",
3 to "three"
)
val s = m.swap()

println("Initial: $m")
println("Swapped: $s")
}
27 changes: 25 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,34 @@ 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> = sortedWith(compareBy({it.surname}, {it.name}))


fun List<String>.mapToPerson(): List<Person> {
return this.map {
val name = it.split(", ")[0]
val surname = it.split(", ")[1]
val age = it.split(", ")[2]
Person(name, surname, age.toInt())
}
}

fun main() {
val p = listOf(
"Иван, Иванов, 1",
"Сидор, Сидоров, 100",
"Петр, Петров, 10",
"Иван, Сидоров, 100"
).mapToPerson()

println("Initial: $p")
println("By Age: ${p.sortByAge()}")
println("By Name: ${p.sortByName()}")
}