diff --git a/.idea/misc.xml b/.idea/misc.xml index cf9abe6..b95853c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/src/GettingHotInHere.java b/src/GettingHotInHere.java index 7a5b209..586c63c 100644 --- a/src/GettingHotInHere.java +++ b/src/GettingHotInHere.java @@ -1,3 +1,9 @@ +/** + * @author Trevor Hartman + * @author MJ Fracess + * + * @since Version 1.0 + */ import java.util.Scanner; public class GettingHotInHere { @@ -10,5 +16,12 @@ public static void main(String[] args) { Scanner scanner = new Scanner(System.in); System.out.print("What is the temperature in °F: "); int number = scanner.nextInt(); + System.out.println(number +"°F"); + double c = (number - 32) * (5.0/9.0); + System.out.printf("or %.3f°C\n", c); + int ci = (int) c; + System.out.printf("and also %d°C\n", ci); + String Y = "If it were 2°C warmer it would be: "; + System.out.printf("%s %.1f°C", Y, c+2); } } diff --git a/src/MrRoboto.java b/src/MrRoboto.java index c576091..a60ea02 100644 --- a/src/MrRoboto.java +++ b/src/MrRoboto.java @@ -1,3 +1,9 @@ +/** + * @author Trevor Hartman + * @author MJ Fracess + * + * @since Version 1.0 + */ // Import the Scanner tool used for reading (All external packages/libraries/apis are imported similarly this) import java.util.Scanner; @@ -14,6 +20,9 @@ public static void main(String[] args) { String domo = "Domo arigato "; System.out.print("My name is Mr. Roboto, are you Kilroy? "); - // Write your program here + String answer = scanner.nextLine(); + System.out.println(domo + answer); + + } }