Noratrieb/TriangleCalculator
1
0
Fork 0
mirror of https://github.com/Noratrieb/TriangleCalculator.git synced 2026-01-14 08:35:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

alpha works

Browse source
This commit is contained in:
nora 2020-12-01 19:15:53 +01:00
parent 1977b1e43d
commit 019b64d8ee
10 changed files with 48 additions and 9 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.

1
.idea/.name generated Normal file
View file

@ -0,0 +1 @@
TriangleCalulator

26
.idea/codeStyles/Project.xml generated Normal file
View file

@ -0,0 +1,26 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View file

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

6
.idea/discord.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DiscordProjectSettings">
<option name="show" value="PROJECT_FILES" />
</component>
</project>

1
.idea/gradle.xml generated
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>

2
.idea/misc.xml generated
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="false" project-jdk-name="15" project-jdk-type="JavaSDK" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK" />
</project>

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

@ -3,9 +3,9 @@ import kotlin.math.*
fun main() {
val triangle = Triangle(4.0, 3.0, 5.0)
println("a: ${Triangle("alpha", 54.13, "a", 4.0)}")
println("b: ${Triangle("alpha", 54.13, "b", 3.0)}")
println("c: ${Triangle("alpha", 54.13, "c", 5.0)}")
println("a: ${Triangle("alpha", 53.13, "a", 4.0)}")
println("b: ${Triangle("alpha", 53.13, "b", 3.0)}")
println("c: ${Triangle("alpha", 53.13, "c", 5.0)}")
println(triangle)
}
@ -27,7 +27,7 @@ class Triangle() {
val angle = angleD.toRadians() //thanks kotlin
if (angleName == "alpha") {
alpha = Angle(angleD, "alpha")
when(sideName){
when (sideName) {
"a" -> {
a = Side(side, "a");
c = Side(a / sin(angle), "c")
@ -35,17 +35,17 @@ class Triangle() {
}
"b" -> {
b = Side(side, "b")
c = Side(side / cos(angle), "c")
a = Side(c * cos(angle), "c")
TODO("fix error on side c (also wrong name")
c = Side(b / cos(angle), "c")
a = Side(c * sin(angle), "a")
}
"c" -> {
c = Side(side, "c")
a = Side(c * sin(angle), "a")
b = Side(c * cos(angle), "a")
}
}
} else if (angleName == "beta") {
when(sideName){
when (sideName) {
"a" -> {
//cos
}