Update app.py

app.py

@@ -4,8 +4,20 @@ from matplotlib_venn import venn3
 from io import BytesIO
 from PIL import Image
 
-def calculate_probabilities(A, B, C, AB, AC, BC, ABC):
-    total = A + B + C - AB - AC - BC + ABC
+def validate_inputs(A, B, C, AB, AC, BC, ABC, U):
+    errors = []
+    if A < AB + AC - ABC:
+        errors.append("A no puede ser menor que la suma de AB y AC menos ABC.")
+    if B < AB + BC - ABC:
+        errors.append("B no puede ser menor que la suma de AB y BC menos ABC.")
+    if C < AC + BC - ABC:
+        errors.append("C no puede ser menor que la suma de AC y BC menos ABC.")
+    if U < A + B + C - AB - AC - BC + ABC:
+        errors.append("El conjunto universal U es menor que la suma total de los conjuntos y sus intersecciones.")
+    return errors
+
+def calculate_probabilities(A, B, C, AB, AC, BC, ABC, U):
+    total = U if U > 0 else (A + B + C - AB - AC - BC + ABC)
     if total == 0:
         return {
             "P(A)": 0,
@@ -17,23 +29,25 @@ def calculate_probabilities(A, B, C, AB, AC, BC, ABC):
             "P(A ∩ B ∩ C)": 0,
         }
 
-    P_A = A / total if total > 0 else 0
-    P_B = B / total if total > 0 else 0
-    P_C = C / total if total > 0 else 0
-    P_AB = AB / total if total > 0 else 0
-    P_AC = AC / total if total > 0 else 0
-    P_BC = BC / total if total > 0 else 0
-    P_ABC = ABC / total if total > 0 else 0
+    P_A = A / total
+    P_B = B / total
+    P_C = C / total
+    P_AB = AB / total
+    P_AC = AC / total
+    P_BC = BC / total
+    P_ABC = ABC / total
     
-    return {
-        "P(A)": P_A,
-        "P(B)": P_B,
-        "P(C)": P_C,
-        "P(A ∩ B)": P_AB,
-        "P(A ∩ C)": P_AC,
-        "P(B ∩ C)": P_BC,
-        "P(A ∩ B ∩ C)": P_ABC,
+    formatted_probs = {
+        "P(A)": f"{P_A:.2%} ({A}/{total})",
+        "P(B)": f"{P_B:.2%} ({B}/{total})",
+        "P(C)": f"{P_C:.2%} ({C}/{total})",
+        "P(A ∩ B)": f"{P_AB:.2%} ({AB}/{total})",
+        "P(A ∩ C)": f"{P_AC:.2%} ({AC}/{total})",
+        "P(B ∩ C)": f"{P_BC:.2%} ({BC}/{total})",
+        "P(A ∩ B ∩ C)": f"{P_ABC:.2%} ({ABC}/{total})",
     }
+    
+    return formatted_probs
 
 def plot_venn(A, B, C, AB, AC, BC, ABC):
     plt.figure(figsize=(8, 8))
@@ -46,9 +60,13 @@ def plot_venn(A, B, C, AB, AC, BC, ABC):
     img = Image.open(buf)
     return img
 
-def main(A, B, C, AB, AC, BC, ABC):
+def main(A, B, C, AB, AC, BC, ABC, U):
+    errors = validate_inputs(A, B, C, AB, AC, BC, ABC, U)
+    if errors:
+        return None, {"error": "\n".join(errors)}
+    
     venn_diagram = plot_venn(A, B, C, AB, AC, BC, ABC)
-    probabilities = calculate_probabilities(A, B, C, AB, AC, BC, ABC)
+    probabilities = calculate_probabilities(A, B, C, AB, AC, BC, ABC, U)
     return venn_diagram, probabilities
 
 iface = gr.Interface(
@@ -60,12 +78,14 @@ iface = gr.Interface(
         gr.Number(label="Cantidad en A ∩ B"),
         gr.Number(label="Cantidad en A ∩ C"),
         gr.Number(label="Cantidad en B ∩ C"),
-        gr.Number(label="Cantidad en A ∩ B ∩ C")
+        gr.Number(label="Cantidad en A ∩ B ∩ C"),
+        gr.Number(label="Conjunto Universal (U)")
     ],
     outputs=[
         gr.Image(type="pil", label="Diagrama de Venn"),
         gr.JSON(label="Probabilidades Calculadas")
-    ]
+    ],
+    live=True
 )
 
 iface.launch()