From 751d3251f98593cd338eb6718c4ebf50619ba08d Mon Sep 17 00:00:00 2001
From: Molly Arant <mccormick.mollyt@gmail.com>
Date: Fri, 12 May 2017 10:42:42 -0400
Subject: [PATCH] completed conversions

---
 .idea/.name                                  |   1 +
 .idea/compiler.xml                           |  18 +----
 .idea/copyright/profiles_settings.xml        |   3 -
 .idea/encodings.xml                          |   6 --
 .idea/kotlinc.xml                            |   7 ++
 .idea/misc.xml                               |  49 ++++++++++----
 .idea/vcs.xml                                |   6 ++
 conversion.iml                               |   3 +-
 src/main/java/ConversionTool.java            |  65 ++++++++++++++-----
 src/test/java/ConversionToolSpec.java        |   1 +
 target/classes/ConversionTool.class          | Bin 1471 -> 1275 bytes
 target/test-classes/ConversionToolSpec.class | Bin 3584 -> 3584 bytes
 12 files changed, 102 insertions(+), 57 deletions(-)
 create mode 100644 .idea/.name
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/encodings.xml
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..5966089
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+conversion
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3c5f7fa..7ec525c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
     <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+      <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
         <module name="conversion" />
       </profile>
     </annotationProcessing>
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..1c24f9a
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinCommonCompilerArguments">
+    <option name="languageVersion" value="1.1" />
+    <option name="apiVersion" value="1.1" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index dfca8c4..0f82c90 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -10,21 +7,34 @@
       </list>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="masterDetails">
     <states>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
       <state key="ProjectJDKs.UI">
         <settings>
           <last-edited>1.8</last-edited>
@@ -37,6 +47,17 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
     </states>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/conversion.iml b/conversion.iml
index 4b044f1..0ddf51c 100644
--- a/conversion.iml
+++ b/conversion.iml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
diff --git a/src/main/java/ConversionTool.java b/src/main/java/ConversionTool.java
index df73653..0fdc780 100644
--- a/src/main/java/ConversionTool.java
+++ b/src/main/java/ConversionTool.java
@@ -3,19 +3,54 @@ public class ConversionTool {
 
     public static void main(String[] args){}
 
-    public static float CentimetersToInches(float centimeters){}
-
-    public static float InchesToCentimeters(float inches){}
-
-    public static float FeetToMeters(float feet){}
-
-    public static float MetersToFeet(float meters){}
-
-    public static float CelsiusToFahrenheit(float celsius){}
-
-    public static float FahrenheitToCelsius(float fahrenheit){}
-
-    public static float MphToKph(float mph){}
-
-    public static float KphToMph(float kph){}
+    public static float CentimetersToInches(float centimeters){
+            if(centimeters<0){
+                return 0;
+            }
+        return (float)(centimeters/2.54);
+    }
+
+    public static float InchesToCentimeters(float inches){
+        if(inches<0){
+            return 0;
+        }
+        return (float)(inches*2.54);
+    }
+
+    public static float FeetToMeters(float feet){
+        if(feet<0){
+            return 0;
+        }
+        return (float)(feet/3.28084);
+    }
+
+    public static float MetersToFeet(float meters){
+        if(meters<0){
+            return 0;
+        }
+        return (float)(meters*3.28084);
+    }
+
+    public static float CelsiusToFahrenheit(float celsius){
+
+        return (float)(celsius*1.8+32);
+    }
+
+    public static float FahrenheitToCelsius(float fahrenheit){
+        return (float)((fahrenheit-32)/1.8);
+    }
+
+    public static float MphToKph(float mph){
+        if(mph<0){
+            return 0;
+        }
+        return (float)(mph*1.609344);
+    }
+
+    public static float KphToMph(float kph){
+        if(kph<0){
+            return 0;
+        }
+        return (float)(kph/1.609344);
+    }
 }
diff --git a/src/test/java/ConversionToolSpec.java b/src/test/java/ConversionToolSpec.java
index 5bbfb07..bbc1a4b 100644
--- a/src/test/java/ConversionToolSpec.java
+++ b/src/test/java/ConversionToolSpec.java
@@ -78,6 +78,7 @@ public void shouldConvertCelsiusToFahrenheit() {
         assertEquals(80, fahrenheit, 0.01);
     }
 
+
     @Test
     public void shouldConvertMphToKph(){
         float kph = ConversionTool.MphToKph(24f);
diff --git a/target/classes/ConversionTool.class b/target/classes/ConversionTool.class
index 7d20ebc7517733b6c814cac4fcef422936d99bfb..e578478ad099c00b7e3814301761f4037b0f4c99 100644
GIT binary patch
literal 1275
zcmaiy&2JJx6u{rK+XZ)5*aF3>{jgXS`h|_!nA8X<hNO{dw3}W$E$hHeft_YqdNf`<
znt1Z$!M~u1Cyge0H~Ket^5kD&VvKKgH?V|8hVXXgef-|X%-6pkKLfxfY$}j|4Y@2m
z`t@Sr!(+LulnTnHdq3sUpKoG)m&;{z#3k*ZkW0V6{CM{K_S+Z~V{n~-e1|#AyGvj)
zUpOEjRrpg%AX#G$ebDRFscV?^HfmBeZkg=^(`DiuDkaZmT>^To!kuI4b{TgJ&fD9_
z>6pwRkj+1-9h%2xv28ld;=boHr@8ItG2JFcrcW`Wwn80`b*P6(gYP<)P0?4%R|{1F
zsx>eYAgD<P9tMwuVPh<e)2ftu2H*2>h-u)FfEJt$F0AMsWb<>kyR3(KtETNz$EFO;
zF^l?Iv=7uGVW?Fa5$E{ck!|q%M>Y<%BV-)+Sb(o+390P!o@>!66O&C34{t-vOM@in
z1QNq0ob+Ir59^22@?Z(h;sX#%0lYWRQBLEjh+l%=sg?IY-r;5fQYd9#iAiy<1rCsb
z89beVESy7)2wug%2p$QPB7p>E;k+Ms0WOAtJ0SUidQN@)2By@L+{+A1@K-137Zi|y
zN!-V<kU0L72v3JOnD==LV|c9*UIKYZ<V_Fp7DL{p|MR5L`eu-qMc(WXZz<&E#_&e#
zn?v3_@)n19mqXripSKmxPZM*KTN#L3kzRw#TaGX^xDqn1_8GTAhMG$$4S|Wa7a;Nx
zgbLR}M81zW^%~XDw$`w%b!@8`;ptEac`IXh(Yk_XaRYfbk+(I(TlIMa*8E4b{tpZZ
B&^iDB

literal 1471
zcmZva%}x_h6vxlBx1DJ_r8reUP(BJ`i$Z~DVgdoAP-7?%Wr7P`IIUAUwVffuz!SK0
z;lj8xMqj|hmBxjxHSslk1~(f2cV<Fon%Ufs^YQ<kbMF25@9Q@rTB7ANWodzJz9&kP
zOl7wA<F(8-3a_59wYLM`*~WuEAK3cuW|M6qo~{4-`;x6sWM7E1DAJNZ$yLKNoHc>s
z#nPcbtYSUW1<KV7Q{Ox7)^%Ie>K#~=n$^%chnj8hyKiJp%Qz8euvW3mGu=KhEK{|t
z&I)w8nqdkwRD4`(YiC-yqnStL1IISZqZOB<*+<CCN4R0F=%!<IbqA8Fb>D2Xbi}e^
zwNw=-)95(`5@1Q#nqydK#qcBZUW#f3bOe&Cy6&jft}6?<Cay^GFmQVg)#71p4V@F?
z6#S~zvURhi8?cHE-L=BsGjon_O*aF<((Z9fwRVnM7;e{HpYv6M1!eGK`oKE18+z5?
z6V8W+xWMNo(*WgUnx#>J2Eu-fy*JtYdRuQeG=(3K#WVB2fCS269mK7SUBI50`%J<o
z9Ab0<Ytl6`QgD{N0Ls%v+){LjhG5~zx3TkNQHgz__@iEW8Ztx@WKsbMk%no+mAFi!
zzQj{R#$i(www2i~WZt|Zsi3g-_RL3Ey<&zafwPRbEKWJf06vIvcyW_nHjU90+~V+F
z#R)Hu*m0a<s9++3mI%-i5wu}wjX-4-v@y`eLo}}3PvaGE+GGSR8K5O2Xa&%wLAwUp
zENG<=Z7PCR@M+T#G%-LEBWUxWEr7NN+7f8DLNu=2-y5%h_cn7*TgII~JswMHE2(<#
zwY;x$$JO+{j)cCrW{Uq-|J?)msiq>C{rRh*{Of*x@jSoxZ_<Ho(-GZnpxe9Xwt{ZA
w(CxiYx21?~=lpJOM9?w;S|)<F16mEVJ<#?+dl;f|<^I|73ivE<!V{zU{~*!Qh5!Hn

diff --git a/target/test-classes/ConversionToolSpec.class b/target/test-classes/ConversionToolSpec.class
index 2cc6d49c42a480e971cca6c05732bbf3b3f6dcc5..929972b9b0680567273fd76e291eabba0be5b7de 100644
GIT binary patch
delta 115
zcmZpWX^`1)o|`j-fsG-QL69MAasjva<oDdpoRJKy3{ea`4AGO<vx!d*;&I`O1FDH<
z;AKddT*xUtc^i)hX9`dx6{sr>tV@p9nKKipD+{PA8?395*M&0=s3sq%s{pL)DX%mD
D0O%S^

delta 115
zcmZpWX^`1)o|`k6fsG-AL69MIasjva<oDdpoDmGH43P{x3{jKUvx!d*;&I`O1*(Z-
z;AM!PT*xUtc^i)hXEIPE1*j_(tV@p9nKJ{ZD-)<I3#_Y=*M&0|s3s4nD<7=uDX%mD
D{KXnM