cpp-pd-code-simplify-interface 0.1.8__tar.gz → 0.1.10__tar.gz

{cpp_pd_code_simplify_interface-0.1.8 → cpp_pd_code_simplify_interface-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.8
+Version: 0.1.10
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015
@@ -59,6 +59,11 @@ result = simplify.simplify(pd_code)
 print(result["final_pd_code"])
 ```
 
+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
 enumeration for a manageable input. Use `reduction_round=K` to cap applied

{cpp_pd_code_simplify_interface-0.1.8 → cpp_pd_code_simplify_interface-0.1.10}/README.md

@@ -39,6 +39,11 @@ result = simplify.simplify(pd_code)
 print(result["final_pd_code"])
 ```
 
+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
 enumeration for a manageable input. Use `reduction_round=K` to cap applied

{cpp_pd_code_simplify_interface-0.1.8 → cpp_pd_code_simplify_interface-0.1.10}/cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp

@@ -125,6 +125,7 @@ struct ReductionResult {
 
 PDCODE_SIMPLIFY_API PDCode parse_pd_code(const std::string& text);
 PDCODE_SIMPLIFY_API std::string format_pd_code(const PDCode& code);
+PDCODE_SIMPLIFY_API std::string format_final_pd_code(const PDCode& code);
 PDCODE_SIMPLIFY_API std::string format_endpoint(const Endpoint& endpoint);
 PDCODE_SIMPLIFY_API std::string format_direction(Direction direction);
 

{cpp_pd_code_simplify_interface-0.1.8 → cpp_pd_code_simplify_interface-0.1.10}/cpp_pd_code_simplify_interface/data/src/native_interface.cpp

@@ -92,7 +92,7 @@ std::string result_to_json(
         append_component_counts(out, *after_removal_components);
         out << "},";
     }
-    out << "\"final_pd_code\":\"" << json_escape(pdcode_simplify::format_pd_code(result.code))
+    out << "\"final_pd_code\":\"" << json_escape(pdcode_simplify::format_final_pd_code(result.code))
         << "\",";
     out << "\"final_crossings\":" << result.code.size() << ",";
     out << "\"final_components\":{";

{cpp_pd_code_simplify_interface-0.1.8 → cpp_pd_code_simplify_interface-0.1.10}/cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -1868,6 +1868,75 @@ std::string format_pd_code(const PDCode& code) {
     return out.str();
 }
 
+std::string format_final_pd_code(const PDCode& code) {
+    if (code.empty()) {
+        return format_pd_code(code);
+    }
+
+    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");
+                }
+            }
+        }
+    }
+
+    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");
+        }
+    }
+
+    for (Crossing& crossing : oriented) {
+        for (int& label : crossing) {
+            label = relabel.at(label);
+        }
+    }
+    return format_pd_code(oriented);
+}
+
 std::string format_endpoint(const Endpoint& endpoint) {
     std::ostringstream out;
     out << '(' << endpoint.crossing << ", " << endpoint.strand << ')';

{cpp_pd_code_simplify_interface-0.1.8 → cpp_pd_code_simplify_interface-0.1.10}/pyproject.toml

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