cpp-pd-code-simplify-interface 0.1.16__py3-none-any.whl → 0.1.17__py3-none-any.whl

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);
@@ -2630,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.16.dist-info → cpp_pd_code_simplify_interface-0.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.16
+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.16.dist-info → cpp_pd_code_simplify_interface-0.1.17.dist-info}/RECORD

@@ -3,10 +3,10 @@ cpp_pd_code_simplify_interface/__main__.py,sha256=ldwc-YVQlsSH9RwXZHCW4r1pmfCBM0
 cpp_pd_code_simplify_interface/_worker.py,sha256=RPLUE-4amjh78C1fmFolmSIM2_s8AXWk-2fWvASq7A0,2338
 cpp_pd_code_simplify_interface/main.py,sha256=CDylx7K0tiaNNtu4jYVZfpYMGuSo6tL0RRX5P_lA5bU,39185
 cpp_pd_code_simplify_interface/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cpp_pd_code_simplify_interface-0.1.16.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
-cpp_pd_code_simplify_interface-0.1.16.dist-info/METADATA,sha256=PqsV_wAaEO9K7FYhzTC5b_8J7m3yq785CrCHQhXxuFA,4762
-cpp_pd_code_simplify_interface-0.1.16.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+cpp_pd_code_simplify_interface-0.1.17.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
+cpp_pd_code_simplify_interface-0.1.17.dist-info/METADATA,sha256=qlta3fIRH0DzDkErujQ1wMVvKC0HSOVJ3fHMfjEkU20,4762
+cpp_pd_code_simplify_interface-0.1.17.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
 cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp,sha256=U49Urs6bMXwkygJsVTnXp-q7y_aWkfRfGimy8mxHoms,5195
 cpp_pd_code_simplify_interface/data/src/native_interface.cpp,sha256=YiYlbGyWTM_FA0V_XzjHtnb9sD4eqMGQmdom6ivm0f0,7094
-cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=2XhK8pWM_IakPFXybm7k7y3YwvO2Jm73Nn4b5x3HETc,95982
-cpp_pd_code_simplify_interface-0.1.16.dist-info/RECORD,,
+cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=XbnEntjvRvTCY8fSa49c9t6xMPbWkLqFij9ivpOkWN4,98792
+cpp_pd_code_simplify_interface-0.1.17.dist-info/RECORD,,