From c14e4628ec6cd1d3ac032c34b4c53173b4da2f8e Mon Sep 17 00:00:00 2001
From: Cody Loyd <codyloyd@gmail.com>
Date: Sat, 4 Nov 2017 23:03:44 -0500
Subject: [PATCH] add solutions to first exercises

---
 tempConversion/.tempConversion.js.swp      | Bin 0 -> 12288 bytes
 tempConversion/.tempConversion.spec.js.swp | Bin 0 -> 12288 bytes
 tempConversion/tempConversion.js           |   8 ++++----
 tempConversion/tempConversion.spec.js      |  10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 tempConversion/.tempConversion.js.swp
 create mode 100644 tempConversion/.tempConversion.spec.js.swp

diff --git a/tempConversion/.tempConversion.js.swp b/tempConversion/.tempConversion.js.swp
new file mode 100644
index 0000000000000000000000000000000000000000..9318635d30fb7f0a51fc0908274ae572a63e24ae
GIT binary patch
literal 12288
zcmeI&O-jQ+90l;H;Lb1f0;6tHHAz1xwhLE^;G)Y4F5_fEQ`1bCOiGJXPv8v%PocQ!
z&bxR8SK>b<LMbh-EpOm;m~`?;e$YipZY$SUZQgV$jK&UQji>LMkI96cu9ujI)X2||
z|1pH}M|Qr~?t8+Cl<=a3XFN;`UD__S)~@oy*zI`(FBLjWj4g*!i!ha`Yh*t;SMfmV
zG*t22(&?oO+i?&A5LhaZnZRytvU;sL{iz=w?DM_d&eHAp0s;_#00bZa0SG_<0uWd|
z0h5&2Bi+_oacdjJT$-DUB_;?!00Izz00bZa0SG_<0uX=z1pc9bM-TYFwivtEri-WN
z|G)qLKWY6=d852io+)>fkkX}eC~e9mB|rCtf&l>tKmY;|fB*y_009U<00IzLVS(|O
zaW0GsXbOxHC#<jhERv2KCQ6%>pYeOf@=aQrOvk+KnXaQ%7W<ZE34X*|ZllbPdA(Mq
wMYU4qE`4$~@bt8o3W6*ahTes@M7bzi&=qjI=&%}YYqo1zm0#OzRghQx0HCCBbN~PV

literal 0
HcmV?d00001

diff --git a/tempConversion/.tempConversion.spec.js.swp b/tempConversion/.tempConversion.spec.js.swp
new file mode 100644
index 0000000000000000000000000000000000000000..52956d9ed3d54ed8806cb31188bf8a3e834fcaf4
GIT binary patch
literal 12288
zcmeI&KX21O7zXeQ5(`qHf(eP?C_`+icK#TVNQem`)PWHsHr(?WTpXW!KD(`|z{mn~
z_wHR_V2T6-EG+O1_zZji#Cs;RiDd+c3G|%w<YfE&p6?fBh<uy<dmDH7*zYrHtBk#W
z{`LNg*^G@&cbG`kUS!Yzq6ro4d3LNf35B035vHwoJgE!zXt>l`_f(W*y{)hc3!#(T
zcyd>2krcA%89B*ss;rW_NL1E1^ov{yf2(Mn0w*B=fi{8C#NK#?1;au8Q@^rynO``6
zw{0ZOK>z{}fB*y_009U<00RH1fXO@TDXs0)e0>+^eW%gS579vY0uX=z1Rwwb2tWV=
z5P$##An*?gg!F<xSYhlH#lHXl@&EtRImSLxUQ!My6(y(KrmRseQNEmI>;vT;<t^n6
z<&g4>5>p;fMwC^`8OmpxV@7#BpYO=di3R}(KmY;|fB*y_009U<00J!n)4I9W8Rygb
zlXJOC+o6pkjEWs^(05(ms9W1*m^y>2^^n9k-5sSL7kno%k9Z~@h9;?G(Ou_pnF&KX
ztR0u{|D@z7@P~^vuLb`2xU5!X78TqmKH!lQ$s|mFuj=As2E*fe^<y?GMAGgL-;_?*
zuCaNQeRpVR#6}6Lu{e)MO9_^z`csj*>~hs$^p_rWO)@z7-ulZA*<A67hrP9Vl~tkU
a`}WE@w_a0zgKN26CYk{K##Z{S%f116Hu)+5

literal 0
HcmV?d00001

diff --git a/tempConversion/tempConversion.js b/tempConversion/tempConversion.js
index 969c37e..742d8e2 100644
--- a/tempConversion/tempConversion.js
+++ b/tempConversion/tempConversion.js
@@ -1,9 +1,9 @@
-var ftoc = function() {
-  
+var ftoc = function(f) {
+ return Math.round((f - 32) * (5/9) * 10) / 10
 }
 
-var ctof = function() {
-  
+var ctof = function(c) {
+  return Math.round(((c * 9/5) + 32) * 10) / 10 
 }
 
 module.exports = {
diff --git a/tempConversion/tempConversion.spec.js b/tempConversion/tempConversion.spec.js
index 6f69a7e..b2961c2 100644
--- a/tempConversion/tempConversion.spec.js
+++ b/tempConversion/tempConversion.spec.js
@@ -4,22 +4,22 @@ describe('ftoc', function() {
   it('works', function() {
     expect(ftoc(32)).toEqual(0);
   });
-  xit('rounds to 1 decimal', function() {
+  it('rounds to 1 decimal', function() {
     expect(ftoc(100)).toEqual(37.8);
   });
-  xit('works with negatives', function() {
+  it('works with negatives', function() {
     expect(ftoc(-100)).toEqual(-73.3);
   });
 });
 
 describe('ctof', function() {
-  xit('works', function() {
+  it('works', function() {
     expect(ctof(0)).toEqual(32);
   });
-  xit('rounds to 1 decimal', function() {
+  it('rounds to 1 decimal', function() {
     expect(ctof(73.2)).toEqual(163.8);
   });
-  xit('works with negatives', function() {
+  it('works with negatives', function() {
     expect(ctof(-10)).toEqual(14);
   });
 });