cpp-pd-code-simplify-interface 0.1.9__tar.gz → 0.1.11__tar.gz

{cpp_pd_code_simplify_interface-0.1.9 → cpp_pd_code_simplify_interface-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.9
+Version: 0.1.11
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015
@@ -59,9 +59,11 @@ 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, labels are renumbered along oriented
+components from `1`, and crossing rows are sorted lexicographically. 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 → cpp_pd_code_simplify_interface-0.1.11}/README.md

@@ -39,9 +39,11 @@ 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, labels are renumbered along oriented
+components from `1`, and crossing rows are sorted lexicographically. 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 → cpp_pd_code_simplify_interface-0.1.11}/cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -510,8 +510,10 @@ std::vector<std::vector<int>> raw_faces_from_pd_code(const PDCode& code) {
 struct Diagram {
     PDCode code;
     std::vector<CrossingState> crossings;
+    std::vector<int> rotations;
 
-    explicit Diagram(PDCode input) : code(std::move(input)), crossings(code.size()) {
+    explicit Diagram(PDCode input)
+        : code(std::move(input)), crossings(code.size()), rotations(code.size(), 0) {
         build_adjacency();
         auto starts = component_starts_from_pd();
         orient_crossings(starts);
@@ -533,6 +535,10 @@ struct Diagram {
         return Endpoint{endpoint.crossing, positive_mod(endpoint.strand + offset, 4)};
     }
 
+    int label_at(int crossing, int strand) const {
+        return code.at(crossing).at(positive_mod(strand + rotations.at(crossing), 4));
+    }
+
     std::vector<Endpoint> crossing_entries() const {
         std::vector<Endpoint> entries;
         entries.reserve(crossings.size() * 2);
@@ -715,6 +721,7 @@ private:
 
     void rotate_crossing_180(int crossing) {
         auto old_adjacent = crossings[crossing].adjacent;
+        rotations[crossing] = positive_mod(rotations[crossing] + 2, 4);
         bool old_directions[4][4]{};
         for (int a = 0; a < 4; ++a) {
             for (int b = 0; b < 4; ++b) {
@@ -1873,28 +1880,64 @@ 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;
+
+    for (int crossing = 0; crossing < static_cast<int>(code.size()); ++crossing) {
+        for (int strand = 0; strand < 4; ++strand) {
+            const int label = diagram.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 = diagram.label_at(crossing, tail);
+                const int out_label = diagram.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);
+    std::sort(oriented.begin(), oriented.end());
+    return format_pd_code(oriented);
 }
 
 std::string format_endpoint(const Endpoint& endpoint) {

{cpp_pd_code_simplify_interface-0.1.9 → cpp_pd_code_simplify_interface-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cpp-pd-code-simplify-interface"
-version = "0.1.9"
+version = "0.1.11"
 description = "Python interface for cpp-pd-code-simplify with runtime C++ compilation."
 authors = [
     {name = "GGN_2015", email = "neko@jlulug.org"}