Noratrieb/TriangleCalculator
1
0
Fork 0
mirror of https://github.com/Noratrieb/TriangleCalculator.git synced 2026-01-16 17:45:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

can now create triangle from angle + side

Browse source
This commit is contained in:
nora 2020-12-01 19:27:30 +01:00
parent 019b64d8ee
commit 7ad27481fe
4 changed files with 52 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
.gradle/6.6.1/executionHistory/executionHistory.lock
View file

Binary file not shown.

BIN
.gradle/6.6.1/fileHashes/fileHashes.lock
View file

Binary file not shown.

BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file

Binary file not shown.

42
src/main/kotlin/main.kt
View file

@ -3,10 +3,14 @@ import kotlin.math.*
fun main() { fun main() {
val triangle = Triangle(4.0, 3.0, 5.0) val triangle = Triangle(4.0, 3.0, 5.0)
println("a: ${Triangle("alpha", 53.13, "a", 4.0)}") println("alpha: a: ${Triangle("alpha", 53.13, "a", 4.0)}")
println("b: ${Triangle("alpha", 53.13, "b", 3.0)}") println("alpha: b: ${Triangle("alpha", 53.13, "b", 3.0)}")
println("c: ${Triangle("alpha", 53.13, "c", 5.0)}") println("alpha: c: ${Triangle("alpha", 53.13, "c", 5.0)}")
println(triangle)
println("beta: a: ${Triangle("beta", 36.87, "a", 4.0)}")
println("beta: b: ${Triangle("beta", 36.87, "b", 3.0)}")
println("beta: c: ${Triangle("beta", 36.87, "c", 5.0)}")
println("\nOriginal$triangle")
} }
class Triangle() { class Triangle() {
@ -15,9 +19,9 @@ class Triangle() {
var b = Side(0.0, "b") var b = Side(0.0, "b")
var c = Side(0.0, "c") var c = Side(0.0, "c")
var alpha = Angle(0.0, "") var alpha = Angle(0.0, "alpha")
var beta = Angle(0.0, "") var beta = Angle(0.0, "beta")
var gamma = Angle(0.0, "") var gamma = Angle(90.0, "gamma")
init { init {
@ -25,7 +29,8 @@ class Triangle() {
constructor(angleName: String, angleD: Double, sideName: String, side: Double) : this() { constructor(angleName: String, angleD: Double, sideName: String, side: Double) : this() {
val angle = angleD.toRadians() //thanks kotlin val angle = angleD.toRadians() //thanks kotlin
if (angleName == "alpha") { when (angleName) {
"alpha" -> {
alpha = Angle(angleD, "alpha") alpha = Angle(angleD, "alpha")
when (sideName) { when (sideName) {
"a" -> { "a" -> {
@ -44,22 +49,33 @@ class Triangle() {
b = Side(c * cos(angle), "a") b = Side(c * cos(angle), "a")
} }
} }
} else if (angleName == "beta") { beta = Angle(asin(b.length / c.length).toDegree(), "beta")
}
"beta" -> {
beta = Angle(angleD, "beta")
when (sideName) { when (sideName) {
"a" -> { "a" -> {
//cos a = Side(side, "a");
c = Side(a / cos(angle), "c")
b = Side(c * sin(angle), "b")
} }
"b" -> { "b" -> {
//sin b = Side(side, "b")
c = Side(b / sin(angle), "c")
a = Side(c * cos(angle), "a")
} }
"c" -> { "c" -> {
//cos c = Side(side, "c")
a = Side(c * cos(angle), "a")
b = Side(c * sin(angle), "a")
} }
} }
} else { }
else -> {
throw IllegalArgumentException("$angleName is not a valid angle") throw IllegalArgumentException("$angleName is not a valid angle")
} }
} }
}
constructor(vararg sides: Double) : this() { constructor(vararg sides: Double) : this() {
a = Side(sides[0], "a") a = Side(sides[0], "a")