cpp-pd-code-simplify-interface 0.1.9__py3-none-any.whl → 0.1.10__py3-none-any.whl

cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -1873,28 +1873,68 @@ std::string format_final_pd_code(const PDCode& code) {
         return format_pd_code(code);
     }
 
-    bool has_label = false;
-    int minimum_label = 0;
-    for (const Crossing& crossing : code) {
-        for (int label : crossing) {
-            if (!has_label || label < minimum_label) {
-                minimum_label = label;
-                has_label = true;
+    const Diagram diagram(code);
+    PDCode oriented(code.size());
+    std::set<int> labels;
+    std::map<int, int> next_label;
+
+    auto label_at = [&](int crossing, int strand) {
+        const Endpoint other = diagram.crossings[crossing].adjacent[strand];
+        return diagram.code[other.crossing][other.strand];
+    };
+
+    for (int crossing = 0; crossing < static_cast<int>(code.size()); ++crossing) {
+        for (int strand = 0; strand < 4; ++strand) {
+            const int label = label_at(crossing, strand);
+            oriented[crossing][strand] = label;
+            labels.insert(label);
+        }
+
+        if (!diagram.crossings[crossing].directions[0][2]) {
+            throw std::invalid_argument("Could not orient final PD crossing from an under-incoming strand");
+        }
+        for (int tail = 0; tail < 4; ++tail) {
+            for (int head = 0; head < 4; ++head) {
+                if (!diagram.crossings[crossing].directions[tail][head]) {
+                    continue;
+                }
+                const int in_label = label_at(crossing, tail);
+                const int out_label = label_at(crossing, head);
+                const auto inserted = next_label.insert(std::make_pair(in_label, out_label));
+                if (!inserted.second && inserted.first->second != out_label) {
+                    throw std::invalid_argument("Final PD component orientation is inconsistent");
+                }
             }
         }
     }
-    if (!has_label || minimum_label == 1) {
-        return format_pd_code(code);
+
+    std::map<int, int> relabel;
+    int next_output_label = 1;
+    for (int start : labels) {
+        if (relabel.count(start) != 0) {
+            continue;
+        }
+
+        int current = start;
+        while (relabel.count(current) == 0) {
+            relabel[current] = next_output_label++;
+            const auto next = next_label.find(current);
+            if (next == next_label.end()) {
+                throw std::invalid_argument("Final PD component orientation is incomplete");
+            }
+            current = next->second;
+        }
+        if (current != start) {
+            throw std::invalid_argument("Final PD component orientation reached another component");
+        }
     }
 
-    PDCode shifted = code;
-    const int offset = 1 - minimum_label;
-    for (Crossing& crossing : shifted) {
+    for (Crossing& crossing : oriented) {
         for (int& label : crossing) {
-            label += offset;
+            label = relabel.at(label);
         }
     }
-    return format_pd_code(shifted);
+    return format_pd_code(oriented);
 }
 
 std::string format_endpoint(const Endpoint& endpoint) {

{cpp_pd_code_simplify_interface-0.1.9.dist-info → cpp_pd_code_simplify_interface-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.9
+Version: 0.1.10
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015
@@ -59,9 +59,10 @@ result = simplify.simplify(pd_code)
 print(result["final_pd_code"])
 ```
 
-Returned `final_pd_code` strings are normalized so the smallest edge label is
-`1`. This is applied only at the final JSON boundary; the C++ backend keeps its
-internal numbering unchanged while simplifying.
+Returned `final_pd_code` strings are normalized for display: each crossing is
+written from the under-incoming edge and labels are renumbered along oriented
+components from `1`. This is applied only at the final JSON boundary; the C++
+backend keeps its internal numbering unchanged while simplifying.
 
 The default `max_paths=-1` uses deterministic heuristic green-path sampling in
 the C++ backend. Use `ban_heuristic=True` to request exhaustive green-path

{cpp_pd_code_simplify_interface-0.1.9.dist-info → cpp_pd_code_simplify_interface-0.1.10.dist-info}/RECORD

@@ -2,10 +2,10 @@ cpp_pd_code_simplify_interface/__init__.py,sha256=aaNwD--zgQX13xiU1hpuvgXy8vVTFG
 cpp_pd_code_simplify_interface/__main__.py,sha256=fdA1QWBe5LNX0fbtaJXa1-dwEhrg_4sS_5UnjaajcMo,80
 cpp_pd_code_simplify_interface/main.py,sha256=4t-6xvjQjsuEWP_oiwedGtgrLYu3316uATrl9t4Q8zs,32778
 cpp_pd_code_simplify_interface/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cpp_pd_code_simplify_interface-0.1.9.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
-cpp_pd_code_simplify_interface-0.1.9.dist-info/METADATA,sha256=rtMStQ-caLgzlWUXmJhJfDQZstn1Sys_tSN-rKPM_LY,3933
-cpp_pd_code_simplify_interface-0.1.9.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+cpp_pd_code_simplify_interface-0.1.10.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
+cpp_pd_code_simplify_interface-0.1.10.dist-info/METADATA,sha256=mFNvOlxRrKm62IouC_r5wWyt7KuJ7XqcAdVq39goeDA,4028
+cpp_pd_code_simplify_interface-0.1.10.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
 cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp,sha256=0WflWW2MB2EAK8GbcKKr9SbnoByMV3hFxt4m4mAerzQ,4917
 cpp_pd_code_simplify_interface/data/src/native_interface.cpp,sha256=16HbKJBPA_EGdbyom4sSoQ7lisDBwaKrl7NsphmlA-k,6555
-cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=c0aJLqzjHloMrVuDf0RD-JksSFfUiDAvSPnn9tC-gIs,89428
-cpp_pd_code_simplify_interface-0.1.9.dist-info/RECORD,,
+cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=EUW5kLkhVxurDhdKZ4dhEXr1_7cUZL42ejXqr6vUo2E,91148
+cpp_pd_code_simplify_interface-0.1.10.dist-info/RECORD,,