cpp-pd-code-simplify-interface 0.1.2__tar.gz → 0.1.4__tar.gz

{cpp_pd_code_simplify_interface-0.1.2 → cpp_pd_code_simplify_interface-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.2
+Version: 0.1.4
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015
@@ -35,7 +35,7 @@ use, the package compiles a cached local dynamic library through
 compiler compatible with `g++` must be available at runtime.
 
 Calls use the C++ library's default preprocessing pipeline: R1-move removal
-followed by nugatory-crossing removal.
+followed by nugatory-crossing removal, then iterative mid-simplification.
 
 ## Example
 
@@ -44,12 +44,14 @@ import cpp_pd_code_simplify_interface as simplify
 
 pd_code = "PD[X[1,5,2,4],X[3,1,4,6],X[5,3,6,2]]"
 result = simplify.simplify(pd_code)
-print(result["simplification_found"])
+print(result["final_pd_code"])
 ```
 
 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.
+enumeration for a manageable input. Use `reduction_round=K` to cap applied
+mid-simplification rounds; the default `-1` runs until stable. Use
+`verbose=True` to forward C++ progress logs to stderr.
 
 Batch use:
 
@@ -76,7 +78,7 @@ Python process needs a 64-bit compiler target.
 Command-line use also supports multi-line PD-code files:
 
 ```sh
-python -m cpp_pd_code_simplify_interface --pd-file inputs.pd --max-paths -1
+python -m cpp_pd_code_simplify_interface --pd-file inputs.pd --max-paths -1 --verbose
 ```
 
 ## Build And Publish

{cpp_pd_code_simplify_interface-0.1.2 → cpp_pd_code_simplify_interface-0.1.4}/README.md

@@ -15,7 +15,7 @@ use, the package compiles a cached local dynamic library through
 compiler compatible with `g++` must be available at runtime.
 
 Calls use the C++ library's default preprocessing pipeline: R1-move removal
-followed by nugatory-crossing removal.
+followed by nugatory-crossing removal, then iterative mid-simplification.
 
 ## Example
 
@@ -24,12 +24,14 @@ import cpp_pd_code_simplify_interface as simplify
 
 pd_code = "PD[X[1,5,2,4],X[3,1,4,6],X[5,3,6,2]]"
 result = simplify.simplify(pd_code)
-print(result["simplification_found"])
+print(result["final_pd_code"])
 ```
 
 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.
+enumeration for a manageable input. Use `reduction_round=K` to cap applied
+mid-simplification rounds; the default `-1` runs until stable. Use
+`verbose=True` to forward C++ progress logs to stderr.
 
 Batch use:
 
@@ -56,7 +58,7 @@ Python process needs a 64-bit compiler target.
 Command-line use also supports multi-line PD-code files:
 
 ```sh
-python -m cpp_pd_code_simplify_interface --pd-file inputs.pd --max-paths -1
+python -m cpp_pd_code_simplify_interface --pd-file inputs.pd --max-paths -1 --verbose
 ```
 
 ## Build And Publish

{cpp_pd_code_simplify_interface-0.1.2 → cpp_pd_code_simplify_interface-0.1.4}/cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp

@@ -2,6 +2,7 @@
 
 #include <array>
 #include <cstddef>
+#include <functional>
 #include <iosfwd>
 #include <string>
 #include <vector>
@@ -49,7 +50,11 @@ struct GreenCrossing {
 
 struct SimplifierOptions {
     int max_paths = -1;
+    int max_threads = -1;
     bool ban_heuristic = false;
+    bool require_applicable = false;
+    bool verbose = false;
+    std::function<void(const std::string&)> progress;
 };
 
 struct LinkComponentSummary {
@@ -107,6 +112,24 @@ struct SimplificationResult {
     std::size_t tested_green_paths = 0;
 };
 
+struct MidSimplificationApplyResult {
+    PDCode code;
+    std::size_t crossingless_components = 0;
+};
+
+struct ReductionResult {
+    PDCode code;
+    std::size_t crossingless_components = 0;
+    int mid_simplification_rounds = 0;
+    int heuristic_failover_rounds = 0;
+    int reidemeister_i_moves = 0;
+    int nugatory_crossing_moves = 0;
+    std::size_t tested_red_paths = 0;
+    std::size_t tested_green_paths = 0;
+    std::string last_path_search_mode;
+    bool stopped_by_round_limit = false;
+};
+
 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_endpoint(const Endpoint& endpoint);
@@ -142,6 +165,17 @@ PDCODE_SIMPLIFY_API SimplificationResult find_simplification(
     const PDCode& code,
     const SimplifierOptions& options = SimplifierOptions{});
 
+PDCODE_SIMPLIFY_API MidSimplificationApplyResult apply_simplification_witness(
+    const PDCode& code,
+    const SimplificationResult& result,
+    std::size_t known_crossingless_components = 0);
+
+PDCODE_SIMPLIFY_API ReductionResult reduce_pd_code(
+    const PDCode& code,
+    std::size_t known_crossingless_components = 0,
+    const SimplifierOptions& options = SimplifierOptions{},
+    int reduction_round = -1);
+
 PDCODE_SIMPLIFY_API std::ostream& operator<<(std::ostream& out, const Endpoint& endpoint);
 
 }  // namespace pdcode_simplify

{cpp_pd_code_simplify_interface-0.1.2 → cpp_pd_code_simplify_interface-0.1.4}/cpp_pd_code_simplify_interface/data/src/native_interface.cpp

@@ -3,6 +3,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <exception>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
@@ -55,14 +56,14 @@ void append_component_counts(
 }
 
 std::string result_to_json(
-    const pdcode_simplify::SimplificationResult& result,
+    const pdcode_simplify::ReductionResult& result,
     const pdcode_simplify::ComponentAnalysis& input_components,
-    const pdcode_simplify::ComponentAnalysis* after_removal_components,
-    const pdcode_simplify::PDSimplificationResult& pd_simplification,
-    const pdcode_simplify::ComponentAnalysis& search_components) {
+    const pdcode_simplify::ComponentAnalysis& final_components,
+    const pdcode_simplify::ComponentAnalysis* after_removal_components) {
     std::ostringstream out;
     out << "{";
-    out << "\"simplification_found\":" << (result.found ? "true" : "false") << ",";
+    out << "\"simplification_found\":"
+        << (result.mid_simplification_rounds > 0 ? "true" : "false") << ",";
     out << "\"input_components\":{";
     append_component_counts(out, input_components);
     out << "},";
@@ -71,50 +72,21 @@ std::string result_to_json(
         append_component_counts(out, *after_removal_components);
         out << "},";
     }
-    out << "\"pd_simplification\":{"
-        << "\"enabled\":true,"
-        << "\"reidemeister_i_moves\":" << pd_simplification.reidemeister_i_moves << ","
-        << "\"nugatory_crossing_moves\":" << pd_simplification.nugatory_crossing_moves << ","
-        << "\"output_crossings\":" << pd_simplification.code.size()
-        << "},";
-    out << "\"search_components\":{";
-    append_component_counts(out, search_components);
+    out << "\"final_pd_code\":\"" << json_escape(pdcode_simplify::format_pd_code(result.code))
+        << "\",";
+    out << "\"final_crossings\":" << result.code.size() << ",";
+    out << "\"final_components\":{";
+    append_component_counts(out, final_components);
     out << "},";
+    out << "\"mid_simplification_rounds\":" << result.mid_simplification_rounds << ",";
+    out << "\"heuristic_failover_rounds\":" << result.heuristic_failover_rounds << ",";
+    out << "\"reidemeister_i_moves\":" << result.reidemeister_i_moves << ",";
+    out << "\"nugatory_crossing_moves\":" << result.nugatory_crossing_moves << ",";
     out << "\"tested_red_paths\":" << result.tested_red_paths << ",";
     out << "\"tested_green_paths\":" << result.tested_green_paths << ",";
-    out << "\"path_search_mode\":\"" << json_escape(result.path_search_mode) << "\"";
-    if (result.found) {
-        out << ",";
-        out << "\"direction\":\"" << pdcode_simplify::format_direction(result.direction) << "\",";
-        out << "\"red_path\":[";
-        for (std::size_t i = 0; i < result.red_path.size(); ++i) {
-            if (i != 0) {
-                out << ",";
-            }
-            out << "{\"crossing\":" << result.red_path[i].crossing
-                << ",\"strand\":" << result.red_path[i].strand << "}";
-        }
-        out << "],";
-        out << "\"green_path\":[";
-        for (std::size_t i = 0; i < result.green_path.size(); ++i) {
-            if (i != 0) {
-                out << ",";
-            }
-            out << result.green_path[i];
-        }
-        out << "],";
-        out << "\"green_crossings\":[";
-        for (std::size_t i = 0; i < result.green_crossings.size(); ++i) {
-            if (i != 0) {
-                out << ",";
-            }
-            const auto& crossing = result.green_crossings[i];
-            out << "{\"from_face\":" << crossing.from_face
-                << ",\"to_face\":" << crossing.to_face
-                << ",\"strand_level\":\"" << json_escape(crossing.strand_level) << "\"}";
-        }
-        out << "]";
-    }
+    out << "\"last_path_search_mode\":\"" << json_escape(result.last_path_search_mode) << "\",";
+    out << "\"stopped_by_round_limit\":"
+        << (result.stopped_by_round_limit ? "true" : "false");
     out << "}";
     return out.str();
 }
@@ -139,6 +111,9 @@ char* pdcode_simplify_run_json(
     const char* pd_text,
     int max_paths,
     int ban_heuristic,
+    int reduction_round,
+    int max_thread,
+    int verbose,
     unsigned long long known_crossingless_components,
     const int* removed_crossings,
     unsigned long long removed_crossing_count) {
@@ -150,7 +125,12 @@ char* pdcode_simplify_run_json(
         const std::string text(pd_text);
         pdcode_simplify::SimplifierOptions options;
         options.max_paths = max_paths;
+        options.max_threads = max_thread;
         options.ban_heuristic = ban_heuristic != 0;
+        options.verbose = verbose != 0;
+        options.progress = [](const std::string& message) {
+            std::cerr << "[pdcode-simplify] " << message << '\n';
+        };
 
         const pdcode_simplify::PDCode code = pdcode_simplify::parse_pd_code(text);
         std::size_t crossingless = static_cast<std::size_t>(known_crossingless_components);
@@ -170,17 +150,15 @@ char* pdcode_simplify_run_json(
                     code, removed, crossingless);
         }
 
-        const auto pd_simplification = pdcode_simplify::simplify_pd_code(code, crossingless);
-        const auto search_components = pdcode_simplify::analyze_components(
-            pd_simplification.code,
-            pd_simplification.crossingless_components);
-        const auto result = pdcode_simplify::find_simplification(pd_simplification.code, options);
+        const auto result =
+            pdcode_simplify::reduce_pd_code(code, crossingless, options, reduction_round);
+        const auto final_components =
+            pdcode_simplify::analyze_components(result.code, result.crossingless_components);
         return copy_string(result_to_json(
             result,
             input_components,
-            has_removal ? &after_removal_components : nullptr,
-            pd_simplification,
-            search_components));
+            final_components,
+            has_removal ? &after_removal_components : nullptr));
     } catch (const std::exception& error) {
         return copy_string(std::string("{\"error\":\"") + json_escape(error.what()) + "\"}");
     } catch (...) {