Update app.py

app.py

@@ -4,15 +4,19 @@ from matplotlib_venn import venn3
 from io import BytesIO
 from PIL import Image
 
-def validate_inputs(A, B, C, AB, AC, BC, ABC, U):
-    total_needed = A + B + C - AB - AC - BC + ABC
-    errors = []
-    if total_needed > U:
-        errors.append("El conjunto universal U debe ser mayor o igual a la suma de los subconjuntos y sus intersecciones.")
-    return errors
-
 def calculate_probabilities(A, B, C, AB, AC, BC, ABC, U):
-    total = U
+    total = U if U > 0 else (A + B + C - AB - AC - BC + ABC)
+    if total == 0:
+        return {
+            "P(A)": 0,
+            "P(B)": 0,
+            "P(C)": 0,
+            "P(A ∩ B)": 0,
+            "P(A ∩ C)": 0,
+            "P(B ∩ C)": 0,
+            "P(A ∩ B ∩ C)": 0,
+        }
+
     P_A = A / total
     P_B = B / total
     P_C = C / total
@@ -20,86 +24,48 @@ def calculate_probabilities(A, B, C, AB, AC, BC, ABC, U):
     P_AC = AC / total
     P_BC = BC / total
     P_ABC = ABC / total
-
-    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
+    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,
+    }
 
 def plot_venn(A, B, C, AB, AC, BC, ABC):
     plt.figure(figsize=(8, 8))
-    subsets = {
-        '100': A - AB - AC + ABC,
-        '010': B - AB - BC + ABC,
-        '001': C - AC - BC + ABC,
-        '110': AB - ABC,
-        '101': AC - ABC,
-        '011': BC - ABC,
-        '111': ABC
-    }
-    venn = venn3(subsets=subsets, set_labels=('A', 'B', 'C'))
-    plt.title(f"Diagrama de Venn")
-
+    venn = venn3(subsets=(A, B, AB, C, AC, BC, ABC), set_labels=('A', 'B', 'C'))
+    plt.title("Venn Diagram")
+    
     buf = BytesIO()
     plt.savefig(buf, format='png')
     buf.seek(0)
     img = Image.open(buf)
     return img
 
-def suggest_intersections(A, B, C, AB, AC, BC, ABC):
-    max_AB = min(A, B)
-    max_AC = min(A, C)
-    max_BC = min(B, C)
-    max_ABC = min(max_AB, max_AC, max_BC)
-
-    min_AB = max(0, AB)
-    min_AC = max(0, AC)
-    min_BC = max(0, BC)
-    min_ABC = max(0, ABC)
-
-    suggestions = {
-        "Máximo valor sugerido para A ∩ B": max_AB,
-        "Mínimo valor sugerido para A ∩ B": min_AB,
-        "Máximo valor sugerido para A ∩ C": max_AC,
-        "Mínimo valor sugerido para A ∩ C": min_AC,
-        "Máximo valor sugerido para B ∩ C": max_BC,
-        "Mínimo valor sugerido para B ∩ C": min_BC,
-        "Máximo valor sugerido para A ∩ B ∩ C": max_ABC,
-        "Mínimo valor sugerido para A ∩ B ∩ C": min_ABC,
-    }
-    return suggestions
-
 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), "sugerencias": suggest_intersections(A, B, C, AB, AC, BC, ABC)}
-    
     venn_diagram = plot_venn(A, B, C, AB, AC, BC, ABC)
     probabilities = calculate_probabilities(A, B, C, AB, AC, BC, ABC, U)
-    return venn_diagram, {"probabilidades": probabilities, "sugerencias": suggest_intersections(A, B, C, AB, AC, BC, ABC)}
+    return venn_diagram, probabilities
 
 iface = gr.Interface(
     fn=main,
     inputs=[
-        gr.Number(label="Conjunto Universal (U)", value=0),
         gr.Number(label="Cantidad en A"),
         gr.Number(label="Cantidad en B"),
         gr.Number(label="Cantidad en C"),
         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="Resultados y Sugerencias")
+        gr.JSON(label="Probabilidades Calculadas")
     ],
     live=True
 )