merge fix for number input

.github/run_test.yml.

@@ -0,0 +1,32 @@
+name: simple_calculator unit test
+
+on: [push]  
+
+jobs:  
+  build:  
+    runs-on: ubuntu-latest  
+    strategy:  
+      matrix:  
+        python-version: ["3.10"]  
+
+    steps:  
+      - uses: actions/checkout@v3  
+      - name: Set up Python ${{ matrix.python-version }}  
+        uses: actions/setup-python@v4  
+        with:  
+          python-version: ${{ matrix.python-version }}  
+      - name: Install dependencies  
+        run: |  
+          python -m pip install --upgrade pip  
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi  
+      - name: Lint with Ruff  
+        run: |  
+          pip install ruff  
+          ruff --format=github --target-version=py310 .  
+        continue-on-error: true  
+      - name: Test with pytest  
+        run: |  
+          coverage run -m pytest tests/tests_1b.py -v -s  
+      - name: Generate Coverage Report  
+        run: |  
+          coverage report -m

.github/workflows/main.yml

@@ -0,0 +1,32 @@
+name: simple_calculator unit test
+
+on: [push]  
+
+jobs:  
+  build:  
+    runs-on: ubuntu-latest  
+    strategy:  
+      matrix:  
+        python-version: ["3.10"]  
+
+    steps:  
+      - uses: actions/checkout@v3  
+      - name: Set up Python ${{ matrix.python-version }}  
+        uses: actions/setup-python@v4  
+        with:  
+          python-version: ${{ matrix.python-version }}  
+      - name: Install dependencies  
+        run: |  
+          python -m pip install --upgrade pip  
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi  
+      - name: Lint with Ruff  
+        run: |  
+          pip install ruff  
+          ruff --format=github --target-version=py310 .  
+        continue-on-error: true  
+      - name: Test with pytest  
+        run: |  
+          coverage run -m pytest tests/tests_1b.py -v -s  
+      - name: Generate Coverage Report  
+        run: |  
+          coverage report -m

labs/lab_1/lab_1a.py

@@ -3,14 +3,16 @@
 
 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 = 8 # m/s
 """
 
 def main():
     print("Hello World!")
 
-    name = "" # TODO: Insert your name between the double quotes
+    name = "Elsa Guan" # TODO: Insert your name between the double quotes
 
     print(f"{name}, Welcome to the CSS course!")
+    print("good job Elsa")
 
 if __name__ == "__main__":
     main()

labs/lab_1/lab_1b.py

@@ -36,15 +36,28 @@ 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 ask_for_number_input(prompt: str) -> float:
+    while True:
+        try:
+            number=float(input(prompt))
+            return number
+        except ValueError:
+            print("Invalid input. Please enter a valid number.")
+def ask_for_operation_input(prompt: str) -> str:
+    while True:
+        operation=str(input(prompt))
+        if operation in ["add", "subtract", "multiply", "divide"]:
+            return operation
+        else:
+            print("Invalid input. Please enter a valid operation (add, subtract, multiply, divide).")
 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: "))
-    operation = input("Enter the operation (add, subtract, multiply, divide): ").strip().lower()
+    num1 = ask_for_number_input("Enter the first number: ")
+    num2 = ask_for_number_input("Enter the second number: ")
+    operation = ask_for_operation_input("Enter the operation (add, subtract, multiply, divide): ").strip().lower()
 
     # Perform the calculation and display the result
     result = simple_calculator(operation, num1, num2)