diff --git a/labs/lab_1/lab_1a.py b/labs/lab_1/lab_1a.py index 9d15ec83..6375b5d6 100644 --- a/labs/lab_1/lab_1a.py +++ b/labs/lab_1/lab_1a.py @@ -3,14 +3,17 @@ The first lab in the BWSI CSS course. To complete this lab, fill out the variable on line 10 with your name. Then, save the code, add it to the staging area, and commit it to the Git tree. + +This is to simulate a change made on a robot: robot_speed = 5 # m/s """ def main(): print("Hello World!") - name = "" # TODO: Insert your name between the double quotes + name = "Law Morano" # TODO: Insert your name between the double quotes print(f"{name}, Welcome to the CSS course!") + print("Hello! I'm Law, and I'm a sophomore from North Carolina. I play NAL soccer and am the captain of my school's FTC team, 9581 Techno Tigers. We just qualified for states! I'm excited to learn more about all of you and expand my knowledge along with you all!") if __name__ == "__main__": main() diff --git a/labs/lab_1/lab_1b.py b/labs/lab_1/lab_1b.py index e58dd957..fcf07728 100644 --- a/labs/lab_1/lab_1b.py +++ b/labs/lab_1/lab_1b.py @@ -9,6 +9,7 @@ """ + def simple_calculator(operation: str, num1: float, num2: float) -> float: """ Function that takes in two numbers and an operation (add, subtract, multiply, divide), @@ -36,14 +37,25 @@ def simple_calculator(operation: str, num1: float, num2: float) -> float: raise ValueError("Cannot divide by zero.") else: raise ValueError("Invalid operation. Please choose from 'add', 'subtract', 'multiply', or 'divide'.") + + +def request_santized_number(prompt: str) -> float: + + while True: + try: + number = float(input(prompt)) + return number + + except ValueError: + print("Invalid input. Please enter a valid number.") def main(): print(f"===== Simple Calculator =====") # Ask the user for sample input - num1 = float(input("Enter the first number: ")) - num2 = float(input("Enter the second number: ")) + num1 = request_santized_number("Enter the first number: ") + num2 = request_santized_number("Enter the second number: ") operation = input("Enter the operation (add, subtract, multiply, divide): ").strip().lower() # Perform the calculation and display the result