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..44d1a81 100644 --- a/src/GettingHotInHere.java +++ b/src/GettingHotInHere.java @@ -9,6 +9,13 @@ public static void main(String[] args) { // The instantiation code for a Scanner instance. Scanner scanner = new Scanner(System.in); System.out.print("What is the temperature in °F: "); - int number = scanner.nextInt(); + int degf = scanner.nextInt(); + System.out.println(degf + "°F"); + int ftoc = ((degf - 32) * 5/9); + float ftocf = ftoc; + System.out.println(ftocf + "°C"); + System.out.println(ftoc + "°C"); + float twowarmer = ftocf + 2; + System.out.println("If it were 2°C warmer it would be: " + twowarmer + "°C"); } } diff --git a/src/MrRoboto.java b/src/MrRoboto.java index c576091..b11a105 100644 --- a/src/MrRoboto.java +++ b/src/MrRoboto.java @@ -14,6 +14,8 @@ 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 message = scanner.nextLine(); + System.out.println(domo + message); + } }