diff --git a/.idea/misc.xml b/.idea/misc.xml index cf9abe6..0548357 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/GettingHotInHere.java b/src/GettingHotInHere.java index 7a5b209..6c8fcc6 100644 --- a/src/GettingHotInHere.java +++ b/src/GettingHotInHere.java @@ -10,5 +10,13 @@ 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 y; + y = (number - 32.0) * 5.0 / 9.0; + System.out.println(y+"°C"); + double x = y +2.0; + int f = (int) y; + System.out.println(f+"°C"); + System.out.println("If it were 2°C warmer it would be "+ x +"°C"); } } diff --git a/src/MrRoboto.java b/src/MrRoboto.java index c576091..04ead24 100644 --- a/src/MrRoboto.java +++ b/src/MrRoboto.java @@ -14,6 +14,7 @@ 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 userAns = scanner.nextLine(); + System.out.print(domo + userAns); } }