From d586a5bcfbb5747714250474678c38060c6fd216 Mon Sep 17 00:00:00 2001
From: Anthony C <anthonycicc@gmail.com>
Date: Tue, 1 Aug 2017 11:43:04 -0400
Subject: [PATCH] Kotlin - Completed Prime Factor Calculator Rust - Refactored
 Hello World

---
 .../src/main/kotlin/PrimeFactorCalculator.kt  | 39 +++++++++++++++++++
 rust/hello-world/src/lib.rs                   | 10 ++---
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 kotlin/prime-factors/src/main/kotlin/PrimeFactorCalculator.kt

diff --git a/kotlin/prime-factors/src/main/kotlin/PrimeFactorCalculator.kt b/kotlin/prime-factors/src/main/kotlin/PrimeFactorCalculator.kt
new file mode 100644
index 0000000..ec55a7a
--- /dev/null
+++ b/kotlin/prime-factors/src/main/kotlin/PrimeFactorCalculator.kt
@@ -0,0 +1,39 @@
+class PrimeFactorCalculator {
+    companion object {
+        fun primeFactors(num: Int): List<Int> = primeFactors(num.toLong()).map { it.toInt() }
+
+        fun primeFactors(num: Long): List<Long> {
+            var tempNum = num
+            val returnList = mutableListOf<Long>()
+            while (tempNum != 1L){
+                val smallestPrimeFactor = tempNum.smallestPrimeFactor()
+                returnList.add(smallestPrimeFactor)
+                tempNum /= smallestPrimeFactor
+                if (smallestPrimeFactor == 1L){
+                    tempNum = 1L
+                }
+            }
+            return returnList
+        }
+    }
+}
+
+fun Int.isPrime(): Boolean = this.toLong().isPrime()
+
+fun Long.isPrime(): Boolean {
+    for (i in 2..Math.sqrt(this.toDouble()).toLong()) {
+        if (this.rem(i) == 0L) return false
+    }
+    return true
+}
+
+fun Int.smallestPrimeFactor(): Int = this.toLong().smallestPrimeFactor().toInt()
+
+fun Long.smallestPrimeFactor(): Long{
+    for (i in 2..this){
+        if (this.rem(i) == 0L){
+            return i
+        }
+    }
+    return 1
+}
\ No newline at end of file
diff --git a/rust/hello-world/src/lib.rs b/rust/hello-world/src/lib.rs
index 2c4fc1a..30e125d 100644
--- a/rust/hello-world/src/lib.rs
+++ b/rust/hello-world/src/lib.rs
@@ -1,8 +1,8 @@
 pub fn hello(name: Option<&str>) -> String {
-	let mut returnString: String;
+	let return_string: String;
 	match name {
-		Some(name) 	=> returnString = "Hello, ".to_string() + &name.to_string() + "!",
-		None		=> returnString = "Hello, World!".to_string(),
+		Some(name) 	=> return_string = "Hello, ".to_string() + &name.to_string() + "!",
+		None		=> return_string = "Hello, World!".to_string(),
 	}
-	return returnString;
-}
\ No newline at end of file
+	return return_string;
+}