Skip to content
This repository was archived by the owner on Sep 6, 2018. It is now read-only.
Closed
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
aaef63b
Мы решили fun seconds
Sep 8, 2016
5df633c
Мы решили fun lengthInMeters и angleInRadian
Sep 8, 2016
2b345c3
Выполнила все задания из первого урока.
AnastasiyaTarasova Sep 12, 2016
2089f93
Lesson2. task1,2
Sep 27, 2016
4e87474
Lesson1\\requested changes\\
Sep 28, 2016
e07bbf8
Lesson2.task1,2\\requested changes\\
Sep 28, 2016
86deb7e
Lesson3
Oct 9, 2016
54489b4
Lesson3/digitNumber\
Oct 9, 2016
0723736
Lesson3/fix\
Oct 12, 2016
eea6e06
Lesson 4
Oct 22, 2016
f52459b
fix all
Oct 27, 2016
da7fe92
fix maxDivisor
Oct 28, 2016
d53148d
fix maxDivisor + Lesson5
Oct 31, 2016
9551b2d
fix maxDivisor + Lesson5
Oct 31, 2016
cf5013f
fix dateStrToDigit
Oct 31, 2016
2b7153a
Lesson5 + fixes
Nov 6, 2016
fd6576c
Lesson5 + fixes
Nov 6, 2016
d2f8933
Lesson5 + fixes
Nov 6, 2016
b14546b
fixes =)
Nov 14, 2016
ffcb823
Impossible + lesson7
Nov 18, 2016
a3296aa
fix
Nov 18, 2016
efdf1f2
fix
Nov 18, 2016
8401f8d
fix
Nov 18, 2016
34bcdc0
lesson7(+ 1 Normal) + some fixes
Nov 24, 2016
5ffb88c
lesson6(Impossible)
Nov 24, 2016
9bcf582
fixes? really?
Nov 29, 2016
48bf8bd
fix
Dec 5, 2016
573e3e9
fix
Dec 5, 2016
a7361f8
fix
Dec 5, 2016
a9a2bb9
fix
Dec 12, 2016
633ff7a
new (lesson 8)
Dec 12, 2016
ddace56
substrings
Dec 12, 2016
09d43f4
substrings
Dec 12, 2016
9880866
substrings
Dec 12, 2016
96fd842
substrings
Dec 12, 2016
d4239b7
fix
Dec 16, 2016
c77f014
fix
Dec 16, 2016
b9388ef
fix
Dec 16, 2016
556a71a
fix
Dec 16, 2016
9106d90
fix
Dec 16, 2016
8d3e526
fix
Dec 16, 2016
0e0caf8
regex
Dec 16, 2016
5f211aa
sumSubMatrix
Dec 17, 2016
530aa30
countSubstrings
Dec 18, 2016
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
Prev Previous commit
Next Next commit
Мы решили fun lengthInMeters и angleInRadian
  • Loading branch information
PeterTheTank authored and PeterTheTank committed Sep 8, 2016
commit 5df633cbe626c2893aa01fab8f79e23bc979fdfb
4 changes: 2 additions & 2 deletions src/lesson1/task1/Simple.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ fun seconds(hours: Int, minutes: Int, seconds: Int) = hours * 3600 + minutes * 6
* Определить длину того же отрезка в метрах (в данном случае 18.98).
* 1 сажень = 3 аршина = 48 вершков, 1 вершок = 4.445 см.
*/
fun lengthInMeters(sagenes: Int, arshins: Int, vershoks: Int): Double = TODO()
fun lengthInMeters(sagenes: Int, arshins: Int, vershoks: Int) : Double { return ((vershoks * 4.445 + arshins * 16* 4.445 + sagenes * 48* 4.445) / 100) }

/**
* Тривиальная
*
* Пользователь задает угол в градусах, минутах и секундах (например, 36 градусов 14 минут 35 секунд).
* Вывести значение того же угла в радианах (например, 0.63256).
*/
fun angleInRadian(grad: Int, min: Int, sec: Int): Double = TODO()
fun angleInRadian(grad: Int, min: Int, sec: Int): Double { return (( grad +(( min + sec / 60.0) /60.0)) * Math.PI /180) }

/**
* Тривиальная
Expand Down