cpp-pd-code-simplify-interface 0.1.15__tar.gz → 0.1.17__tar.gz

{cpp_pd_code_simplify_interface-0.1.15 → cpp_pd_code_simplify_interface-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.15
+Version: 0.1.17
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015

{cpp_pd_code_simplify_interface-0.1.15 → cpp_pd_code_simplify_interface-0.1.17}/cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -1842,6 +1842,18 @@ void emit_step_pd(const SimplifierOptions& options, int round, const PDCode& cod
     }
 }
 
+std::string no_path_restart_signature(
+    const PDCode& code,
+    std::size_t crossingless_components) {
+    std::ostringstream out;
+    out << crossingless_components << ':' << format_final_pd_code(code);
+    return out.str();
+}
+
+PDCode canonical_output_code(const PDCode& code) {
+    return parse_pd_code(format_final_pd_code(code));
+}
+
 std::string search_mode_for_options(const SimplifierOptions& options) {
     if (options.max_paths == -1 && !options.ban_heuristic) {
         return "heuristic";
@@ -2538,6 +2550,7 @@ ReductionResult reduce_pd_code(
     ReductionResult output;
     output.code = code;
     output.crossingless_components = known_crossingless_components;
+    std::set<std::string> exhausted_no_path_signatures;
 
     try {
         check_timeout(run_options);
@@ -2598,8 +2611,7 @@ ReductionResult reduce_pd_code(
                 emit_progress(run_options, message.str());
             }
 
-            if (!search.found && reduction_round < 0 &&
-                run_options.max_paths == -1 && !run_options.ban_heuristic) {
+            if (!search.found && run_options.max_paths == -1 && !run_options.ban_heuristic) {
                 SimplifierOptions brute_options = run_options;
                 brute_options.max_paths = -1;
                 brute_options.ban_heuristic = true;
@@ -2631,6 +2643,45 @@ ReductionResult reduce_pd_code(
             }
 
             if (!search.found) {
+                if (run_options.max_paths == -1) {
+                    check_timeout(run_options);
+                    const std::string signature = no_path_restart_signature(
+                        output.code, output.crossingless_components);
+                    if (exhausted_no_path_signatures.insert(signature).second) {
+                        const std::size_t before_restart_crossings = output.code.size();
+                        const std::size_t before_restart_crossingless =
+                            output.crossingless_components;
+                        const PDSimplificationResult restarted =
+                            simplify_pd_code(
+                                canonical_output_code(output.code),
+                                output.crossingless_components);
+                        const bool changed =
+                            restarted.code != output.code ||
+                            restarted.crossingless_components != output.crossingless_components;
+                        output.code = restarted.code;
+                        output.crossingless_components = restarted.crossingless_components;
+                        output.reidemeister_i_moves += restarted.reidemeister_i_moves;
+                        output.nugatory_crossing_moves += restarted.nugatory_crossing_moves;
+                        {
+                            std::ostringstream message;
+                            message << "round " << round
+                                    << " canonical_restart changed="
+                                    << (changed ? "yes" : "no")
+                                    << " crossings=" << before_restart_crossings
+                                    << " -> " << output.code.size()
+                                    << " crossingless_components="
+                                    << before_restart_crossingless
+                                    << " -> " << output.crossingless_components
+                                    << " r1_moves=" << restarted.reidemeister_i_moves
+                                    << " nugatory_moves="
+                                    << restarted.nugatory_crossing_moves;
+                            emit_progress(run_options, message.str());
+                        }
+                        if (changed) {
+                            continue;
+                        }
+                    }
+                }
                 {
                     std::ostringstream message;
                     message << "round " << round

{cpp_pd_code_simplify_interface-0.1.15 → cpp_pd_code_simplify_interface-0.1.17}/pyproject.toml

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