diff --git a/.idea/misc.xml b/.idea/misc.xml index cf9abe6..4458232 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..5cdafe2 100644 --- a/src/GettingHotInHere.java +++ b/src/GettingHotInHere.java @@ -1,3 +1,11 @@ +/** + * + * @author Trevor Hartman + * @author Cameron Meng + * + * @since Version 1.0 + * + */ import java.util.Scanner; public class GettingHotInHere { @@ -9,6 +17,8 @@ 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(); + double Fahrenheit = scanner.nextInt(); + double Celsius = (Fahrenheit - 32.0) * 5.0 / 9.0; + System.out.printf(Fahrenheit+" would be "+Celsius+" degrees in celsius."); } } diff --git a/src/MrRoboto.java b/src/MrRoboto.java index c576091..7e24893 100644 --- a/src/MrRoboto.java +++ b/src/MrRoboto.java @@ -1,3 +1,11 @@ +/** + * + * @author Trevor Hartman + * @author Cameron Meng + * + * @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 +22,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 rp = scanner.nextLine(); + System.out.println(domo+rp); } }