Update app.py

app.py

@@ -728,12 +728,16 @@ app.layout = html.Div(
                     ),
                 ]),
                 
-                # --- Subpath flip controls ---
+                # --- Subpath flip controls + Switch dimensions ---
                 html.Div(
                     style={"display": "flex", "gap": "8px", "alignItems": "center", "marginBottom": "8px"},
                     children=[
                         html.Button("Flip subpath", id="btn_flip_subpath", n_clicks=0,
                                     style={"background": "#2563EB", "color": "white"}),
+                
+                        html.Button("Switch dimensions", id="btn_switch_dims", n_clicks=0,
+                                    style={"background": "#6B7280", "color": "white"}),
+                
                         dcc.Input(
                             id="subpath_dim",
                             type="number",
@@ -750,6 +754,12 @@ app.layout = html.Div(
                     id="subpath_select_store",
                     data={"active": False, "start_idx": None, "end_idx": None}
                 ),
+                
+                dcc.Store(
+                    id="switch_dims_store",
+                    data={"active": False, "start_idx": None, "end_idx": None}
+                ),
+
 
                 html.Div(),  # empty cell just to keep the grid tidy
             ],
@@ -865,7 +875,8 @@ def stats(d, path):
 
 @app.callback(
     Output("path_store", "data"),
-    Output("subpath_select_store", "data"),         # NEW
+    Output("subpath_select_store", "data"),
+    Output("switch_dims_store", "data"),
     Input("fig", "clickData"),
     Input("btn_clear", "n_clicks"),
     Input("btn_longest_cib", "n_clicks"),
@@ -874,15 +885,17 @@ def stats(d, path):
     Input("btn_set", "n_clicks"),
     Input("btn_swap", "n_clicks"),
     Input("btn_flip", "n_clicks"),
-    Input("btn_flip_subpath", "n_clicks"),          # NEW
+    Input("btn_flip_subpath", "n_clicks"),
+    Input("btn_switch_dims", "n_clicks"),
     State("path_store", "data"),
     State("manual_path", "value"),
     State("dim", "value"),
     State("swap_i", "value"),
     State("swap_j", "value"),
     State("flip_k", "value"),
-    State("subpath_select_store", "data"),          # NEW
-    State("subpath_dim", "value"),                  # NEW
+    State("subpath_select_store", "data"),
+    State("subpath_dim", "value"), 
+    State("switch_dims_store", "data"),
     prevent_initial_call=True
 )
 def update_path(clickData,
@@ -894,6 +907,7 @@ def update_path(clickData,
                 n_swap,
                 n_flip,
                 n_flip_subpath,
+                n_switch_dims,
                 path,
                 manual_text,
                 d,
@@ -901,7 +915,8 @@ def update_path(clickData,
                 swap_j,
                 flip_k,
                 subsel,
-                subpath_dim):
+                subpath_dim,
+                switchsel):
 
     trigger = ctx.triggered_id
     path = path or []
@@ -909,28 +924,30 @@ def update_path(clickData,
 
     # default selection store
     subsel = subsel or {"active": False, "start_idx": None, "end_idx": None}
+    switchsel = switchsel or {"active": False, "start_idx": None, "end_idx": None}
+
 
     # 1) Clear
     if trigger == "btn_clear":
-        return [], {"active": False, "start_idx": None, "end_idx": None}
+        return [], {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
     # 2a) Longest CIB
     if trigger == "btn_longest_cib":
-        return longest_cib(d), {"active": False, "start_idx": None, "end_idx": None}
+        return longest_cib(d), {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
     # 2b) Longest Symmetric CIB
     if trigger == "btn_longest_sym_cib":
-        return longest_sym_cib(d), {"active": False, "start_idx": None, "end_idx": None}
+        return longest_sym_cib(d), {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
     
     # 2c) Shorter CIB
     if trigger == "btn_shorter_cib":
-        return shorter_cib(d), {"active": False, "start_idx": None, "end_idx": None}
+        return shorter_cib(d), {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
     # 3) Manual set path
     if trigger == "btn_set":
         newp = parse_path(manual_text or "", d)
-        return (newp if newp else path), {"active": False, "start_idx": None, "end_idx": None}
+        return (newp if newp else path), {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
     # 4) Swap two dimensions
     if trigger == "btn_swap":
@@ -938,22 +955,22 @@ def update_path(clickData,
             i = int(swap_i) if swap_i is not None else None
             j = int(swap_j) if swap_j is not None else None
         except (TypeError, ValueError):
-            return path, subsel
+            return path, subsel, switchsel
         if i is None or j is None:
             return path, subsel
         if not (0 <= i < d and 0 <= j < d):
-            return path, subsel
-        return swap_dims_path(path, d, i, j), subsel
+            return path, subsel, switchsel
+        return swap_dims_path(path, d, i, j), subsel, switchsel
 
     # 5) Flip one dimension (whole path)
     if trigger == "btn_flip":
         try:
             k = int(flip_k) if flip_k is not None else None
         except (TypeError, ValueError):
-            return path, subsel
+            return path, subsel, switchsel
         if k is None or not (0 <= k < d):
-            return path, subsel
-        return flip_dim_path(path, d, k), subsel
+            return path, subsel, switchsel
+        return flip_dim_path(path, d, k), subsel, switchsel
 
     # 6) The new two-click button:
     #    First click: enter selection mode.
@@ -962,7 +979,7 @@ def update_path(clickData,
         active = bool(subsel.get("active"))
         if not active:
             # enter selection mode
-            return path, {"active": True, "start_idx": None, "end_idx": None}
+            return path, {"active": True, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
         # active == True, so this is the "second click": apply
         try:
@@ -971,13 +988,13 @@ def update_path(clickData,
             i = None
         if i is None or not (0 <= i < d):
             # invalid dimension, just exit selection mode
-            return path, {"active": False, "start_idx": None, "end_idx": None}
+            return path, {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
         s = subsel.get("start_idx")
         e = subsel.get("end_idx")
         if s is None or e is None or e <= s:
             # nothing meaningful selected, exit
-            return path, {"active": False, "start_idx": None, "end_idx": None}
+            return path, {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
         # subpath is path[s:e+1] = (v1,...,vk)
         # desired: keep prefix (..., v1), keep suffix (vk, ...),
@@ -987,74 +1004,138 @@ def update_path(clickData,
         rest = path[e:]                     # starts at vk
         new_path = head + flipped_subpath + rest
 
-        return new_path, {"active": False, "start_idx": None, "end_idx": None}
+        return new_path, {"active": False, "start_idx": None, "end_idx": None}, {"active": False, "start_idx": None, "end_idx": None}
 
+    # 7) Switch dimensions mode toggle
+    if trigger == "btn_switch_dims":
+        active = bool(switchsel.get("active"))
+        if not active:
+            # enter switch-dims selection mode
+            return path, subsel, {"active": True, "start_idx": None, "end_idx": None}
+        else:
+            # cancel switch-dims selection mode
+            return path, subsel, {"active": False, "start_idx": None, "end_idx": None}
 
-    # 7) Figure clicks
+    
+    # 8) Figure clicks
     if trigger == "fig" and clickData and clickData.get("points"):
         p = clickData["points"][0]
         cd = p.get("customdata")
 
+        # If we're in switch-dims mode, vertex clicks define exactly 3 consecutive vertices
+        if switchsel.get("active") and isinstance(cd, (int, float)):
+            vid = int(cd)
+            idx = index_in_path(path, vid)
+            if idx is None:
+                return path, subsel, switchsel
+        
+            s = switchsel.get("start_idx")
+            e = switchsel.get("end_idx")
+        
+            # first vertex
+            if s is None:
+                return path, subsel, {"active": True, "start_idx": idx, "end_idx": idx}
+        
+            if e is None:
+                e = s
+        
+            # must extend consecutively forward: idx == e+1
+            if idx == e + 1 and (idx - s) <= 2:
+                new_sel = {"active": True, "start_idx": s, "end_idx": idx}
+        
+                # if we have 3 vertices selected: apply switch
+                if idx == s + 2:
+                    x = path[s]
+                    y = path[s + 1]
+                    z = path[s + 2]
+        
+                    a = edge_dimension(x, y)
+                    b = edge_dimension(y, z)
+                    if a is None or b is None:
+                        # not a valid 2-edge segment, exit mode
+                        return path, subsel, {"active": False, "start_idx": None, "end_idx": None}
+        
+                    # new middle vertex to traverse b then a
+                    y2 = x ^ (1 << b)
+        
+                    # optional safety: don't create duplicates elsewhere in the path
+                    if y2 in set(path) and y2 not in {x, y, z}:
+                        return path, subsel, {"active": False, "start_idx": None, "end_idx": None}
+        
+                    new_path = path[:]
+                    new_path[s + 1] = y2
+                    return new_path, subsel, {"active": False, "start_idx": None, "end_idx": None}
+        
+                return path, subsel, new_sel
+        
+            # allow shrinking by clicking current end
+            if idx == e:
+                new_e = e - 1 if e > s else s
+                return path, subsel, {"active": True, "start_idx": s, "end_idx": new_e}
+        
+            # otherwise ignore
+            return path, subsel, switchsel
+
         # If we're in subpath selection mode, vertex clicks define (start_idx, end_idx)
         if subsel.get("active") and isinstance(cd, (int, float)):
             vid = int(cd)
             idx = index_in_path(path, vid)
             if idx is None:
-                return path, subsel
+                return path, subsel, switchsel
 
             s = subsel.get("start_idx")
             e = subsel.get("end_idx")
 
             # first selected vertex
             if s is None:
-                return path, {"active": True, "start_idx": idx, "end_idx": idx}
+                return path, {"active": True, "start_idx": idx, "end_idx": idx}, {"active": False, "start_idx": None, "end_idx": None}
 
             # enforce consecutive forward selection along the path
             # user must click idx == e+1 to extend
             if e is None:
                 e = s
             if idx == e + 1:
-                return path, {"active": True, "start_idx": s, "end_idx": idx}
+                return path, {"active": True, "start_idx": s, "end_idx": idx}, {"active": False, "start_idx": None, "end_idx": None}
 
             # allow shrinking by clicking the current end again
             if idx == e:
                 # pop last selected (shrink by 1) if possible
                 new_e = e - 1 if e > s else s
-                return path, {"active": True, "start_idx": s, "end_idx": new_e}
+                return path, {"active": True, "start_idx": s, "end_idx": new_e}, {"active": False, "start_idx": None, "end_idx": None}
 
             # otherwise ignore
-            return path, subsel
+            return path, subsel, switchsel
 
         # Normal mode: your existing click-to-build-path behavior
         if isinstance(cd, (int, float)):
             vid = int(cd)
 
             if not path:
-                return [vid], subsel
+                return [vid], subsel, switchsel
 
             if vid == path[-1]:
-                return path[:-1], subsel
+                return path[:-1], subsel, switchsel
 
             if len(path) >= 2 and vid == path[-2]:
-                return path[:-1], subsel
+                return path[:-1], subsel, switchsel
 
             if hamming_dist(vid, path[-1]) == 1:
-                return path + [vid], subsel
+                return path + [vid], subsel, switchsel
 
-            return [vid], subsel
+            return [vid], subsel, switchsel
 
         if isinstance(cd, (list, tuple)) and len(cd) == 2:
             u, v = int(cd[0]), int(cd[1])
             if not path:
-                return [u, v], subsel
+                return [u, v], subsel, switchsel
             last = path[-1]
             if last == u:
-                return path + [v], subsel
+                return path + [v], subsel, switchsel
             if last == v:
-                return path + [u], subsel
-            return [u, v], subsel
+                return path + [u], subsel, switchsel
+            return [u, v], subsel, switchsel
 
-    return path, subsel
+    return path, subsel, switchsel
 
 
 @app.callback(
@@ -1251,8 +1332,24 @@ def mark_neighbors_label(d, path, mark_dist_vals):
         labelStyle={"display": "inline-block", "background-color": "yellow"},
     )
 
-    
+@app.callback(
+    Output("btn_switch_dims", "style"),
+    Input("switch_dims_store", "data"),
+)
+def style_switch_dims_button(switchsel):
+    switchsel = switchsel or {}
+    active = bool(switchsel.get("active"))
+
+    base = {
+        "color": "white",
+        "border": "none",
+        "padding": "6px 12px",
+        "borderRadius": "8px",
+        "cursor": "pointer",
+    }
 
+    return {**base, "background": "#DC2626"} if active else {**base, "background": "#6B7280"}
+    
 if __name__ == "__main__":
     import os
     port = int(os.environ.get("PORT", "7860"))  # HF uses 7860