From e0255570ea2f81739955ac380166d155411cc67e Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 14:47:42 -0800 Subject: [PATCH 1/6] Completed 05_05 --- .../learning-java-2825378/Main.class | Bin 1195 -> 867 bytes src/Main.java | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 7fd82a5c80c02f5198baae4e59f0de65446ae279..9ddcecd925d8394e0d8585e48941fd9a05603e90 100644 GIT binary patch delta 528 zcmYjNOD_Xq6g^)%{iYq$q8&Q*R`lgj^;mR67lKG679z3JR3j6jjbMSKzoF@hzaSw* zN-V^dKOy3Oi1SS)e3QBN+}F8}>%f;Z-oKw;0OT=WH?mn-*rvfJ7vC<`yON6!XP+xK z*13TY+I4i8=tNjRTQ53?je>}WmIAQQrK8(K6n1?%7c|g=ULAcV`Y}*{jfb?2KJ*v0{jZq+)O6=#Qtx@_Dwk+BH zQr@tQTZUS6wJmwSOe)+2!=wL&Q(HE0xRB8?ScWQZi|OpFt$YA+^; z46;mO>UWx|%MZjY=;XK1_JrW-JtE2G4q{0QgOxQ}=_X=-i*~aC5abskZ9A{u!PPq5 d;fC0TbiC2Do706Hn+oRmF+-#-Im?I#b3YKuLahJ* literal 1195 zcmaJ>-A)rh7(GLmZo5`MehZ2g1Z+{M|B5AC*oJ6Q)L2quyc)I>SlI41yHg@B;kB=! z7n*S41NczJGu3cCc&)O$o;SbiUQfo|wX$#!Lu zXO87CjtPOewmeqVFmR>*=;=dBv6g|3i7nPj3B2bAv0iXcaWIJ~8`C+=U{+vi2)}^c zF{k-~A-POZYTC#PSi91rg;fn(N?^S11?p|Ly|1D@x$jdmSr1+5H)Z6Rbzf=eLyx|t z>jqq*`!sR8zSL?j)Y9Ko(r2VD;pt+nRx35h?0ZZ}YhX*%=%V&I9|$v&{E|p1>Xs?Eiq~0&wrNqlTCdhM2TvWw1l~6jkZ_4Nt2|22TYRJ~0CYZHiN9vpNN~hN}u* zTo3}eH$kAHsxRYM#Wr3DtX_(FSSU7L3f%m^scDj4+*raKZc5^84?KMI@oHiKz0F2U)Yv`szPP@u*<%Y2u5ZZG3DC5xy Date: Wed, 29 Jan 2020 14:50:28 -0800 Subject: [PATCH 2/6] Begin state --- src/Main.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/Main.java b/src/Main.java index 83614c92..83ae1431 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,19 +1,7 @@ public class Main { - public static double calculateTotalMealPrice(double listedMealPrice, - double tipRate, - double taxRate) { - double tip = tipRate * listedMealPrice; - double tax = taxRate * listedMealPrice; - double result = listedMealPrice + tip + tax; - return result; - } - public static void main(String[] args) { - double groupTotalMealPrice = calculateTotalMealPrice(100, .20, .08); - System.out.println(groupTotalMealPrice); - double individualMealPrice = groupTotalMealPrice / 5; - System.out.println(individualMealPrice); + } } From 2c95497f24f726b2810cc819c67cfcc29b40fc54 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 15:02:28 -0800 Subject: [PATCH 3/6] End state --- out/production/learning-java-2825378/Main.class | Bin 867 -> 579 bytes src/Main.java | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 9ddcecd925d8394e0d8585e48941fd9a05603e90..62f3fb9b77cfd8365cd1f288c37ef4f937d61fae 100644 GIT binary patch delta 319 zcmYL@J5Iwu5Qe{X92>7qAjX7OAiSLfkcFrykW#pSBHY0R;-M%Y2vAaS0Lu;6fC3N& z4IKyI0<@d~F?I@8n*Xso`_Ft^AEy5NeR~IX*-Z8JfvEggonR<59-}rDk1@s-m9yj~ ziF!%@IO-;Y6GiFb{8mwJ#&Iil@R_g)JSM574?FHOGd8mxbJWwXP}?jh%x-ep&n(r+ z?$w@aT^?Os_XY|TXFsZbH;+-wHIPs&!G`!qSP7TgFQ`Wm28)9EGg3=}-mrmXR>V21 zvL-kA=R-_N!hV1q;Jo7QKT!>znfgzv6dfj8TBcSdIFGCqyZEdViqnkHq$Qz>ws?b$ EKYkS@2mk;8 literal 867 zcmZuv*>2N76g^H{J8{z{&CX5>WGT?FK14w+5)mMj0wPr;#M8vF!W74j9J^w9;5*UnEyeR}!p&b#6(3(Lrw$YrpCyas(+NKZq> z7Oow+B6N2AP`KNUa32QJc8J^PcDv1P8by>$lryNHdVoOx#Vm9tJlBs%qtuJ3Nx#K@ zFYJebBPJaSM{&%=@eEGjq=v#FH5$yR>Ttp$TmFbtvOVcJ_oKz*9zK;b67MN#9k#iW3`hTH(z-k?l+#Dlt1R(+ZY3F`5c+HnoLS^j zkv@qhRBk+(ON*yYUD6wOngixVFy?WEL(+_n13#MnKhuKrMsiP%q63q*`hFDH&TXlb zr4{)NH7Bg{#uD);lF-!sb6ut1;;wODSpNd;1C0dMxT-Yxo#C397vL<;(Mzi zhR!TdY1E#zjjGNyRjV3yHD$N0s`Z|!Ib5EF3UmP`7Lnp_kdC1@8Dl$YsB>3VgO=i1 zL6erwjy%?B8SKm8JT29o#06RwQ7&R*pUgDI2iA%(iC@IxS1jHAh(i4{j?{}d<=>;z xr1Mv1nfSmG-({j^`Ge&sY$fJ)nx_zr6S@@FlyI46YOG1&3N1CqtIQ;D?GNlxp`ri) diff --git a/src/Main.java b/src/Main.java index 83ae1431..2dbb240b 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,7 +1,10 @@ public class Main { public static void main(String[] args) { - + double result = Math.pow(2, 5); + System.out.println(result); + + Math. } } From 9d9dfb8df53e6108aab1084f08afc6a4b653937e Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 15:17:54 -0800 Subject: [PATCH 4/6] Edit begin --- src/Main.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Main.java b/src/Main.java index 2dbb240b..83ae1431 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,10 +1,7 @@ public class Main { public static void main(String[] args) { - double result = Math.pow(2, 5); - System.out.println(result); - - Math. + } } From 7f2550da8a7f43df6604d33d6ccdadeecffcbfc8 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Thu, 30 Jan 2020 10:47:14 -0800 Subject: [PATCH 5/6] Update end --- .../META-INF/learning-java-2825378.kotlin_module | Bin 0 -> 16 bytes src/Main.java | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 out/production/learning-java-2825378/META-INF/learning-java-2825378.kotlin_module diff --git a/out/production/learning-java-2825378/META-INF/learning-java-2825378.kotlin_module b/out/production/learning-java-2825378/META-INF/learning-java-2825378.kotlin_module new file mode 100644 index 0000000000000000000000000000000000000000..a49347afef10a9b5f95305e1058ba36adec7d6dd GIT binary patch literal 16 RcmZQzU|?ooU|@t|0RRA102TlM literal 0 HcmV?d00001 diff --git a/src/Main.java b/src/Main.java index 83614c92..3b645a0f 100644 --- a/src/Main.java +++ b/src/Main.java @@ -10,8 +10,9 @@ public static double calculateTotalMealPrice(double listedMealPrice, } public static void main(String[] args) { - double groupTotalMealPrice = calculateTotalMealPrice(100, .20, .08); + double groupTotalMealPrice = calculateTotalMealPrice(100, .2, .08); System.out.println(groupTotalMealPrice); + double individualMealPrice = groupTotalMealPrice / 5; System.out.println(individualMealPrice); } From 638b39c1e5298fc89d1d25bf329ee42aa825a097 Mon Sep 17 00:00:00 2001 From: ahmedsport Date: Thu, 30 Jun 2022 17:07:06 +0100 Subject: [PATCH 6/6] 1 --- src/Main.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Main.java b/src/Main.java index 9a5c655b..3688c28e 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,16 +1,22 @@ +package src; + public class Main { - public static void calculateTotalMealPrice(double listedMealPrice, + public static double calculateTotalMealPrice(double listedMealPrice, double tipRate, double taxRate) { double tip = tipRate * listedMealPrice; double tax = taxRate * listedMealPrice; double result = listedMealPrice + tip + tax; - System.out.println("Your total meal price is " + result); + return result; } public static void main(String[] args) { - + double groupTotalMealPrice = calculateTotalMealPrice(100,.2,.08); + System.out.println("total meal price £" + groupTotalMealPrice); + + double individualMealPrice = groupTotalMealPrice / 5; + System.out.println("individual meal price £" +individualMealPrice); } }