Update app.py

app.py

@@ -48,29 +48,16 @@ def predict_new_j0_j45(age, aca_magnitude, aca_axis_deg):
         new_j45 = model_j45(input_data_j45).item()
     return new_j0, new_j45
 
-def calculate_magnitude_and_axis(j0, j45):
-    """Calculate magnitude and axis from J0 and J45."""
-    magnitude = math.sqrt(j0**2 + j45**2)
-    
-    # Calculate intermediate axis (Z)
-    if j0 != 0:
-        Z = math.degrees(0.5 * math.atan(j45 / j0))
-    else:
-        Z = 90  # This matches Excel's behavior when j0 is zero
-    
-    # Apply the conditional logic
-    if j0 > 0:
-        if j45 > 0:
-            final_axis = Z
-        else:
-            final_axis = Z + 180
-    else:
-        final_axis = Z + 90
-    
-    # Ensure the final axis is between 0 and 180
-    final_axis = final_axis % 180
-    
-    return magnitude, final_axis, Z  # Return Z as the intermediate axis
+def calculate_magnitude(j0, j45):
+    """Calculate magnitude from J0 and J45."""
+    return math.sqrt(j0**2 + j45**2)
+
+def calculate_axis(j0, j45):
+    """Calculate axis from J0 and J45."""
+    axis = 0.5 * math.degrees(math.atan2(j45, j0))
+    if axis < 0:
+        axis += 180
+    return axis
 
 def main():
     st.set_page_config(page_title='Astigmatism Prediction', page_icon=':eyeglasses:', layout='wide')
@@ -84,31 +71,36 @@ def main():
 
     if st.button('Predict!'):
         if 18 <= age <= 90 and 0 <= aca_magnitude <= 10 and 0 <= aca_axis <= 180:
-            # Calculate initial J0 and J45 (for display purposes only)
+            # Calculate initial J0 and J45 (for comparison)
             initial_j0, initial_j45 = calculate_initial_j0_j45(aca_magnitude, aca_axis)
             
             # Predict new J0 and J45 using the models
             new_j0, new_j45 = predict_new_j0_j45(age, aca_magnitude, aca_axis)
             
             # Calculate predicted magnitude and axis
-            predicted_magnitude, predicted_axis, intermediate_axis = calculate_magnitude_and_axis(new_j0, new_j45)
+            predicted_magnitude = calculate_magnitude(new_j0, new_j45)
+            predicted_axis = calculate_axis(new_j0, new_j45)
             
             st.success(f'Predicted Total Corneal Astigmatism Magnitude: {predicted_magnitude:.2f} D')
             st.success(f'Predicted Total Corneal Astigmatism Axis: {predicted_axis:.1f}°')
             
             # Display intermediate values for verification
+            st.info(f'Input ACA - Magnitude: {aca_magnitude:.2f} D, Axis: {aca_axis:.1f}°')
             st.info(f'Initial J0: {initial_j0:.2f}, Initial J45: {initial_j45:.2f}')
             st.info(f'Predicted J0: {new_j0:.2f}, Predicted J45: {new_j45:.2f}')
-            st.info(f'ACA Axis (Degrees): {aca_axis:.2f}°, ACA Axis (Radians): {math.radians(aca_axis):.4f}')
-            st.info(f'Intermediate Axis (Z): {intermediate_axis:.1f}°')
+            st.info(f'Intermediate calculations:')
+            st.info(f'  atan2(J45, J0): {math.degrees(math.atan2(new_j45, new_j0)):.2f}°')
+            st.info(f'  0.5 * atan2(J45, J0): {0.5 * math.degrees(math.atan2(new_j45, new_j0)):.2f}°')
             
             # Additional debugging information
             st.subheader('Debugging Information:')
-            st.write(f'atan(J45/J0): {math.degrees(math.atan(new_j45 / new_j0) if new_j0 != 0 else math.pi/2):.2f}°')
-            st.write(f'0.5 * atan(J45/J0): {0.5 * math.degrees(math.atan(new_j45 / new_j0) if new_j0 != 0 else math.pi/2):.2f}°')
-            st.write(f'J0 > 0: {new_j0 > 0}, J45 > 0: {new_j45 > 0}')
-            st.write(f'Quadrant adjustment: {90 if new_j0 < 0 else 0}°')
-            st.write(f'Final modulo operation: {predicted_axis % 180:.1f}°')
+            st.write(f'Input age: {age}')
+            st.write(f'Input ACA magnitude: {aca_magnitude:.2f} D')
+            st.write(f'Input ACA axis: {aca_axis:.1f}°')
+            st.write(f'Calculated ACA X: {aca_magnitude * math.cos(math.radians(aca_axis)):.4f}')
+            st.write(f'Calculated ACA Y: {aca_magnitude * math.sin(math.radians(aca_axis)):.4f}')
+            st.write(f'Model J0 input: [{age}, {aca_axis}, {aca_magnitude * math.cos(math.radians(aca_axis)):.4f}]')
+            st.write(f'Model J45 input: [{age}, {aca_axis}, {aca_magnitude * math.sin(math.radians(aca_axis)):.4f}]')
         else:
             st.error('Please ensure all inputs are within the specified ranges.')