From 019b64d8eec2b5ac9ab2683899b04bc361a6eeb4 Mon Sep 17 00:00:00 2001
From: Nilstrieb <nils.heydecker@gmx.ch>
Date: Tue, 1 Dec 2020 19:15:53 +0100
Subject: [PATCH] alpha works

---
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/6.6.1/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .idea/.name                                   |   1 +
 .idea/codeStyles/Project.xml                  |  26 ++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml          |   5 ++++
 .idea/discord.xml                             |   6 ++++
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   2 +-
 src/main/kotlin/main.kt                       |  16 +++++------
 10 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/discord.xml

diff --git a/.gradle/6.6.1/executionHistory/executionHistory.lock b/.gradle/6.6.1/executionHistory/executionHistory.lock
index 543864c7f27ee53f53fa5bc8b75ff2d909853be5..d07744dcec0d7b35d68252465d4a8dc26dc9c91a 100644
GIT binary patch
literal 17
UcmZR69({hYg68h?3=q%<0691X2><{9

literal 17
UcmZR69({hYg68h?3=rT3066dj!2kdN

diff --git a/.gradle/6.6.1/fileHashes/fileHashes.lock b/.gradle/6.6.1/fileHashes/fileHashes.lock
index f3116571195193783f55cc443a9c95b30b72cf71..659dc80acb781c4722f40d5ff78e2f20438261ef 100644
GIT binary patch
literal 17
UcmZR6FQ@-N<oz`n1_(F<05m}a;Q#;t

literal 17
UcmZR6FQ@-N<oz`n1_&qs05jzTg#Z8m

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index a7c04f24f6fd3ed49e47359a8db44009122e321a..be6b84b925053b4d93ed1b6c0a1e026de39ca390 100644
GIT binary patch
literal 17
TcmZQ>71J`}p6uJt00Hp;9q|Ix

literal 17
TcmZQ>71J`}p6uJt00G7T9mN8u

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..61bbeb0
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+TriangleCalulator
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..31d977a
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..cd711a0
--- /dev/null
+++ b/.idea/discord.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ba1ec5c..611e7c8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -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>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2f38549..55c1801 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -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>
\ No newline at end of file
diff --git a/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
index 8a7cacd..2a40ad4 100644
--- a/src/main/kotlin/main.kt
+++ b/src/main/kotlin/main.kt
@@ -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
                 }