From e664b95676ee6392dc20f432594ffcb2ca95583e Mon Sep 17 00:00:00 2001 From: ant Date: Fri, 12 May 2017 11:27:33 -0400 Subject: [PATCH 1/3] Working on coding now --- .idea/compiler.xml | 20 +------ .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 -- .idea/misc.xml | 31 +--------- conversion.iml | 17 ------ src/main/java/ConversionTool.java | 56 ++++++++++++++----- src/test/java/ConversionToolSpec.java | 6 ++ target/classes/ConversionTool.class | Bin 1471 -> 1246 bytes target/test-classes/ConversionToolSpec.class | Bin 3584 -> 3746 bytes 9 files changed, 50 insertions(+), 89 deletions(-) delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 conversion.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3c5f7fa..b412c1f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,32 +1,16 @@ - - - - - - - - - - - - - - - - + - - + \ No newline at end of file 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 @@ - - - \ 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 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index dfca8c4..e8942bd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/conversion.iml b/conversion.iml deleted file mode 100644 index 4b044f1..0000000 --- a/conversion.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/ConversionTool.java b/src/main/java/ConversionTool.java index df73653..9a67ba4 100644 --- a/src/main/java/ConversionTool.java +++ b/src/main/java/ConversionTool.java @@ -3,19 +3,45 @@ 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 centimeters/2.54f; + } + + public static float InchesToCentimeters(float inches){ + if(inches <0){ + return 0; + } + return inches*2.54f; + } + + public static float FeetToMeters(float feet){ + if(feet < 0){ + return 0; + } + return feet* 0.3048f; + } + + public static float MetersToFeet(float meters){ + if(meters < 0){ + return 0; + } + return meters/0.3048f; + } + + public static float CelsiusToFahrenheit(float celsius){ + return (celsius*1.8f)+32; + } + + public static float FahrenheitToCelsius(float fahrenheit){ + return (fahrenheit-32)*.5556f; + + } + + public static float MphToKph(float mph){return 4.3f;} + + public static float KphToMph(float kph){return 4.3f;} } diff --git a/src/test/java/ConversionToolSpec.java b/src/test/java/ConversionToolSpec.java index 5bbfb07..e1f8dc5 100644 --- a/src/test/java/ConversionToolSpec.java +++ b/src/test/java/ConversionToolSpec.java @@ -78,6 +78,12 @@ public void shouldConvertCelsiusToFahrenheit() { assertEquals(80, fahrenheit, 0.01); } + @Test + public void shouldConvertCelsiusToFahrenheitBelowZero() { + float fahrenheit = ConversionTool.CelsiusToFahrenheit(-4.33f); + assertEquals(24.206, 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..d377f2d9d5ba4a74f41b05d7c77ceb4052ea3c76 100644 GIT binary patch literal 1246 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 G+WHrO!kIt- literal 3584 zcmaKt&r=&^7{{N5ut`G*5YiuX1fkFxuq8^XwzQChq$yAWrEIZ9+PVn~SsHdRKRDQn z2OUox|Ak&V&N$=Aj0XpM^x(l6?|O9f;=vgYj^p>;WOv^!@0!D#&AZ?C`Rx07-*@xF zzu$gGL~oN3rb${4lS238)Nj-3C+L+^cZ!9d{(SLIm^SGBz|nJ}KpHn#>b{&FU;CY< z0%`QKt_O1J?_%K>*7f}enoM7-e^XA+e%^P)`sbgwx;~K8Ghco-++6!ZPJR0EueZL6 zKMiDl-kM-#w&b*eEIxtEQ7isXPG?uQ5`Vq?BJgqn{pla$Pg(SloCbq^g7i2@A4(+O z&<(vlCsAi&Vnd=p*4)-4>Rr|iZKbha)T)YFte_{hY?jo@hFaCx?{;UPUe;?8#h0_D zai~>mx@jn;Sy?~OO4lVCsg=z}WxI8+p4E)HzOU60Q_Mx9RMs$3*4r0SUZTOf4J)#t z*K{y4hGEv#I%*==w`^8-lY0$3Yf{l_b(Bwd%5Q2_(}Q3gHs+!yx}xo(?4jlx_da;5 zh{9KwsJrA&NAxK6pjRGCBJrd6#s@u5p4YUxViqikkk_&)(WocHkgXuQvcu;+8C${e zoEO*{tyuN2Id;Go;p~`=mPm{{p7W~CtL3U@lre!7i+n*Q#yIs^Vn41PsIKScH8s!Ai7IuZpw@ z-b{GiY*b5HUT25!^zm~xwWl7c5qgs@1_|FqDg|jfLK^KvXqQS6Dzips%^qu>u%^PA zeJbHtAFqhR#%d-js*D4| z4Yk4!ej=C4u@}yOz4f_zNPBmB#NIfp8)MuR=k^Jn$l5X94H0seJ!G#BjnV{O-t2Rd zB<2q7CHzX_Tf%qO*1&AIXqA1nNA$lA{NQk)VAeP#QXe{(Uj2Kb_)I)KO5p6SMOj0zBYYt&+Lfmi=9$mhSbC|{$ zbd7TiUYCe5>o8nh*j-WR>h;r=0A~WaCOHnTYfhjm<#2diQ9oUmplb@ck{p89B|@Yf zgsZEcO~q#iPh%RFq3a6A;B|=@8HeHOiZy8fy5fGiu7Yz7x@I^IuWMeQE9-E0T?2ko znT4)7=t^-2UY7`wa}XX~zKnTHBMV(Qj=}2^F>X2xSJ$Z~orbP6OxIb#i)8_vMd(`M zIJ~aBK-Vn+=d~scfivvKVK37aa8`Xd3j)rffHTshQE<-ran`|6z`5tcSrTw=I~;!b zNBx%nK9>IhmVc8&@XIekEISBy`N!E*d``$>1Kl`?ec(6z@QcwHjI9S7mj<;&Q|Gz{o6IR>vw#8|`s Ia0lJ}5Bza;{r~^~ From 0be381c973ad0525588bffb87f87e0d8f6580851 Mon Sep 17 00:00:00 2001 From: ant Date: Fri, 12 May 2017 11:38:22 -0400 Subject: [PATCH 2/3] Finished MicroLab Conversion for now --- src/main/java/ConversionTool.java | 14 ++++++++++++-- target/classes/ConversionTool.class | Bin 1246 -> 1300 bytes 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/ConversionTool.java b/src/main/java/ConversionTool.java index 9a67ba4..586679c 100644 --- a/src/main/java/ConversionTool.java +++ b/src/main/java/ConversionTool.java @@ -41,7 +41,17 @@ public static float FahrenheitToCelsius(float fahrenheit){ } - public static float MphToKph(float mph){return 4.3f;} + public static float MphToKph(float mph){ + if(mph < 0){ + return 0; + } + return mph*1.609344f; + } - public static float KphToMph(float kph){return 4.3f;} + public static float KphToMph(float kph){ + if(kph < 0){ + return 0; + } + return kph/1.609344f; + } } diff --git a/target/classes/ConversionTool.class b/target/classes/ConversionTool.class index d377f2d9d5ba4a74f41b05d7c77ceb4052ea3c76..c62a33625d52d59ac10af345ae672ae4a0ac5cac 100644 GIT binary patch delta 147 zcmcb|IfZM2CX4;qe}6XW+ObT2$s}yWp0$pFfq|KU7fA8}X$A&e1~vvg1`Y-TAfJJO zhk+4D@-nD0NC0U`AZBJ@byV$)3>rX_m>4tx Dc9#!n delta 131 zcmbQjb&qp`CW}Mo%vl?C?O2L+85n_(fq_|weI1ZuV&DamY+xZB20kF02O`a&${+#c faWbeehyg`-fNVTk^-#2`gS9d;XaF@aF=zq+y)X%= From 6cafd4e5dbe40b1d76ef78c8a418a3b8242ee8df Mon Sep 17 00:00:00 2001 From: ant Date: Fri, 12 May 2017 11:38:51 -0400 Subject: [PATCH 3/3] commiting hidden files --- .idea/.name | 1 + .idea/kotlinc.xml | 7 +++++++ .idea/vcs.xml | 6 ++++++ conversion.iml | 16 ++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/vcs.xml create mode 100644 conversion.iml 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/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..1c24f9a --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ 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 @@ + + + + + + \ No newline at end of file diff --git a/conversion.iml b/conversion.iml new file mode 100644 index 0000000..4e3316b --- /dev/null +++ b/conversion.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file