Update inference.py

inference.py

@@ -501,25 +501,41 @@ def create_all_shap_plots(user_inputs, max_display=10):
 
 
 # ---------------------------------------------------------------------------
-# Icon array  — proper stick figures
+# Icon array
+# ---------------------------------------------------------------------------
+# Root cause of previous gaps / distortion:
+#   Plotly shape coords are in DATA units. If px-per-data-unit differs on
+#   x vs y axes the circle head becomes an ellipse and spacing looks uneven.
+#
+# Fix:
+#   • Use EQUAL axis spans on x and y  (both = cols + 2*pad = 10.3)
+#   • Set width and height so that usable pixels are EQUAL on both axes:
+#       usable_w = W - margin_l - margin_r  = W - 20
+#       usable_h = H - margin_t - margin_b  = H - 100
+#       usable_w == usable_h  →  H = W + 80
+#   • This guarantees 1 data-unit = same number of pixels on both axes,
+#     so circles are round and spacing is perfectly uniform.
 # ---------------------------------------------------------------------------
 
-def _stick_figure_shapes(cx, cy, color, s=0.42):
+def _stick_figure(cx, cy, color, s):
     """
-    Draw a classic stick figure centred at (cx, cy) with scale s.
-
-    Parts:
-      - head   : circle
-      - spine  : vertical line from neck to hips
-      - arms   : angled lines left/right from mid-spine
-      - legs   : angled lines left/right from hips
+    Returns Plotly shape dicts for a stick figure centred at (cx, cy).
+    s  = scale (data units).  With a cell size of 1.0, s ≈ 0.46 gives
+    a figure that fills ~75 % of the cell vertically.
+
+    Anatomy (all offsets relative to cy):
+      head centre  :  cy + s*0.55          radius s*0.18
+      neck top     :  cy + s*0.35
+      hip          :  cy - s*0.15
+      arm branch   :  cy + s*0.18
+      foot         :  cy - s*0.55
     """
     shapes = []
-    lw = dict(color=color, width=max(1, s * 4))   # line width scales with size
+    lw = dict(color=color, width=1.8)   # fixed pixel width — looks consistent
 
-    # ── head ──────────────────────────────────────────────────────────────
-    hr = s * 0.22                      # head radius
-    hy = cy + s * 0.60                 # head centre y
+    # head
+    hr = s * 0.18
+    hy = cy + s * 0.55
     shapes.append(dict(
         type="circle", xref="x", yref="y",
         x0=cx - hr, y0=hy - hr,
@@ -528,54 +544,29 @@ def _stick_figure_shapes(cx, cy, color, s=0.42):
         line=dict(color=color, width=0),
     ))
 
-    # key y levels
-    neck_y  = cy + s * 0.35            # base of head / top of spine
-    hip_y   = cy - s * 0.20            # bottom of spine / top of legs
-    arm_y   = cy + s * 0.15            # where arms branch from spine
-    foot_y  = cy - s * 0.60            # feet
-
-    # ── spine ─────────────────────────────────────────────────────────────
-    shapes.append(dict(
-        type="line", xref="x", yref="y",
-        x0=cx, y0=neck_y,
-        x1=cx, y1=hip_y,
-        line=lw,
-    ))
-
-    # ── arms (angled outward) ──────────────────────────────────────────────
-    arm_dx = s * 0.35
-    arm_dy = s * 0.18
-    # left arm
-    shapes.append(dict(
-        type="line", xref="x", yref="y",
-        x0=cx,          y0=arm_y,
-        x1=cx - arm_dx, y1=arm_y - arm_dy,
-        line=lw,
-    ))
-    # right arm
-    shapes.append(dict(
-        type="line", xref="x", yref="y",
-        x0=cx,          y0=arm_y,
-        x1=cx + arm_dx, y1=arm_y - arm_dy,
-        line=lw,
-    ))
-
-    # ── legs (angled outward) ──────────────────────────────────────────────
-    leg_dx = s * 0.28
-    # left leg
-    shapes.append(dict(
-        type="line", xref="x", yref="y",
-        x0=cx,         y0=hip_y,
-        x1=cx - leg_dx, y1=foot_y,
-        line=lw,
-    ))
-    # right leg
-    shapes.append(dict(
-        type="line", xref="x", yref="y",
-        x0=cx,         y0=hip_y,
-        x1=cx + leg_dx, y1=foot_y,
-        line=lw,
-    ))
+    neck_y = cy + s * 0.35
+    hip_y  = cy - s * 0.15
+    arm_y  = cy + s * 0.18
+    foot_y = cy - s * 0.55
+
+    # spine
+    shapes.append(dict(type="line", xref="x", yref="y",
+        x0=cx, y0=neck_y, x1=cx, y1=hip_y, line=lw))
+
+    # arms
+    adx = s * 0.32
+    ady = s * 0.15
+    shapes.append(dict(type="line", xref="x", yref="y",
+        x0=cx, y0=arm_y, x1=cx - adx, y1=arm_y - ady, line=lw))
+    shapes.append(dict(type="line", xref="x", yref="y",
+        x0=cx, y0=arm_y, x1=cx + adx, y1=arm_y - ady, line=lw))
+
+    # legs
+    ldx = s * 0.26
+    shapes.append(dict(type="line", xref="x", yref="y",
+        x0=cx, y0=hip_y, x1=cx - ldx, y1=foot_y, line=lw))
+    shapes.append(dict(type="line", xref="x", yref="y",
+        x0=cx, y0=hip_y, x1=cx + ldx, y1=foot_y, line=lw))
 
     return shapes
 
@@ -591,20 +582,36 @@ def icon_array(probability, outcome):
     }
 
     event_label, no_event_label = outcome_labels.get(outcome, ("Event", "No Event"))
-    n_total    = 100
-    n_event    = round(probability * n_total)
-    n_no_event = n_total - n_event
+    n_event    = round(probability * 100)
+    n_no_event = 100 - n_event
     cols, rows = 10, 10
 
+    # ── Layout constants ──────────────────────────────────────────────────
+    # Icons sit on an integer grid 0..9 × 0..9.
+    # Padding of 0.65 on each side → axis span = 9 + 2*0.65 = 10.30
+    # Margins: left=10, right=10, top=95, bottom=10
+    # usable_w = W - 20 ;  usable_h = H - 105
+    # To ensure px_per_unit identical on both axes: usable_w == usable_h
+    #   → H = W + 85
+    # We also enforce equal axis spans (both 10.30).
+
+    PAD  = 0.65
+    W    = 400
+    H    = W + 85          # = 485  →  usable = 380 px on both axes
+    S    = 0.46            # figure scale (≈ 75 % vertical fill per cell)
+
+    x_lo, x_hi = -PAD, (cols - 1) + PAD   # -0.65 … 9.65  span=10.30
+    y_lo, y_hi = -PAD, (rows - 1) + PAD   # -0.65 … 9.65  span=10.30
+
     all_shapes = []
     icon_idx   = 0
 
-    for row in range(rows):        # row 0 = top
-        for col in range(cols):    # col 0 = left
+    for row in range(rows):       # row 0 → top of grid
+        for col in range(cols):   # col 0 → left
             color = "#e05555" if icon_idx < n_event else "#3bbfad"
-            cx = col
-            cy = rows - 1 - row    # invert so row 0 is at top
-            all_shapes.extend(_stick_figure_shapes(cx, cy, color, s=0.38))
+            cx    = col
+            cy    = (rows - 1) - row    # invert: row 0 → cy=9 (top)
+            all_shapes.extend(_stick_figure(cx, cy, color, S))
             icon_idx += 1
 
     fig = go.Figure()
@@ -612,27 +619,32 @@ def icon_array(probability, outcome):
         title=dict(
             text=(
                 f"<b>{OUTCOME_DESCRIPTIONS.get(outcome, outcome)}</b><br>"
-                f"<span style='font-size:12px;color:#e05555'>■ {event_label}: {n_event}%</span>"
+                f"<span style='font-size:12px;color:#e05555'>"
+                f"■ {event_label}: {n_event}%</span>"
                 f"&nbsp;&nbsp;"
-                f"<span style='font-size:12px;color:#3bbfad'>■ {no_event_label}: {n_no_event}%</span>"
+                f"<span style='font-size:12px;color:#3bbfad'>"
+                f"■ {no_event_label}: {n_no_event}%</span>"
             ),
             x=0.5, xanchor="center",
             font=dict(size=14, color="black"),
         ),
         shapes=all_shapes,
         xaxis=dict(
-            range=[-0.7, cols - 0.3],
+            range=[x_lo, x_hi],
             showgrid=False, zeroline=False, showticklabels=False,
             fixedrange=True,
         ),
         yaxis=dict(
-            range=[-0.8, rows - 0.2],
+            range=[y_lo, y_hi],
             showgrid=False, zeroline=False, showticklabels=False,
             fixedrange=True,
+            # scaleanchor / scaleratio intentionally OMITTED —
+            # equal spans + equal usable pixels already guarantee
+            # identical px/unit on both axes without distortion.
         ),
-        height=440,
-        width=420,
-        margin=dict(l=10, r=10, t=85, b=10),
+        width=W,
+        height=H,
+        margin=dict(l=10, r=10, t=95, b=10),
         plot_bgcolor="white",
         paper_bgcolor="white",
     )