Skip to content
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
22 changes: 18 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
UTF-8
</project.reporting.outputEncoding>

<kotlin.version>1.2.51</kotlin.version>
<kotlin.version>1.2.71</kotlin.version>
<kotlinx.html.version>0.6.11</kotlinx.html.version>
<junit.jupiter.version>5.0.0</junit.jupiter.version>
<junit.vintage.version>4.12.0</junit.vintage.version>
Expand All @@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -66,6 +66,17 @@
<artifactId>kotlinx-html-jvm</artifactId>
<version>${kotlinx.html.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
Expand Down Expand Up @@ -100,19 +111,22 @@
</plugin>
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
<groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>
<executions>
<execution>
<id>compile</id>
<phase>process-sources</phase>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>process-test-sources</phase>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
</goals>
Expand Down
19 changes: 15 additions & 4 deletions src/lesson1/task1/Simple.kt
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ fun quadraticRootProduct(a: Double, b: Double, c: Double): Double {
* Пример главной функции
*/
fun main(args: Array<String>) {
val x1x2 = quadraticRootProduct(1.0, 13.0, 42.0)
println("Root product: $x1x2")
val x = 5
val result = sqr (x)
println ("$x * $x = $result")
}

/**
Expand All @@ -75,7 +76,12 @@ fun lengthInMeters(sagenes: Int, arshins: Int, vershoks: Int): Double = TODO()
* Пользователь задает угол в градусах, минутах и секундах (например, 36 градусов 14 минут 35 секунд).
* Вывести значение того же угла в радианах (например, 0.63256).
*/
fun angleInRadian(deg: Int, min: Int, sec: Int): Double = TODO()
fun angleInRadian(deg: Int, min: Int, sec: Int): Double {
val degRad = PI / 180 * deg
val minRad = PI / 180 / 60 * min
val secRad = PI / 180 / 60 / 60 * sec
return degRad + minRad + secRad
}

/**
* Тривиальная
Expand All @@ -91,7 +97,12 @@ fun trackLength(x1: Double, y1: Double, x2: Double, y2: Double): Double = TODO()
* Пользователь задает целое число, большее 100 (например, 3801).
* Определить третью цифру справа в этом числе (в данном случае 8).
*/
fun thirdDigit(number: Int): Int = TODO()
fun thirdDigit(number: Int): Int {
var vasya = number
vasya = vasya / 100
vasya = vasya % 10
return vasya
}

/**
* Простая
Expand Down
4 changes: 4 additions & 0 deletions test/lesson1/task1/Tests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,12 @@ class Tests {
assertEquals(8, thirdDigit(3801))
assertEquals(1, thirdDigit(100))
assertEquals(0, thirdDigit(1000))
assertEquals(5, thirdDigit(4567))
assertEquals(8, thirdDigit(2329858))
assertEquals(8, thirdDigit(2329858))
}


@Test
@Tag("Easy")
fun travelMinutes() {
Expand Down