cpp-pd-code-simplify-interface 0.1.5__tar.gz → 0.1.7__tar.gz

{cpp_pd_code_simplify_interface-0.1.5 → cpp_pd_code_simplify_interface-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cpp-pd-code-simplify-interface
-Version: 0.1.5
+Version: 0.1.7
 Summary: Python interface for cpp-pd-code-simplify with runtime C++ compilation.
 License-Expression: MIT
 Author: GGN_2015
@@ -56,7 +56,8 @@ 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
 mid-simplification rounds; the default `-1` runs until stable. Use
-`verbose=True` to forward C++ progress logs to stderr.
+`verbose=True` to forward timestamped C++ progress logs to stderr. Verbose log
+lines use local wall-clock time in `YYYY-MM-DD HH:MM:SS` format.
 
 Batch use:
 

{cpp_pd_code_simplify_interface-0.1.5 → cpp_pd_code_simplify_interface-0.1.7}/README.md

@@ -36,7 +36,8 @@ 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
 mid-simplification rounds; the default `-1` runs until stable. Use
-`verbose=True` to forward C++ progress logs to stderr.
+`verbose=True` to forward timestamped C++ progress logs to stderr. Verbose log
+lines use local wall-clock time in `YYYY-MM-DD HH:MM:SS` format.
 
 Batch use:
 

{cpp_pd_code_simplify_interface-0.1.5 → cpp_pd_code_simplify_interface-0.1.7}/cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp

@@ -87,13 +87,6 @@ struct RandomInflationResult {
     int type_ii_moves = 0;
 };
 
-struct ReidemeisterSimplificationResult {
-    PDCode code;
-    std::size_t crossingless_components = 0;
-    int type_i_moves = 0;
-    int type_ii_moves = 0;
-};
-
 struct PDSimplificationResult {
     PDCode code;
     std::size_t crossingless_components = 0;
@@ -153,10 +146,6 @@ PDCODE_SIMPLIFY_API RandomInflationResult randomly_increase_crossings(
     const PDCode& code,
     const RandomInflationOptions& options = RandomInflationOptions{});
 
-PDCODE_SIMPLIFY_API ReidemeisterSimplificationResult simplify_reidemeister_i_ii(
-    const PDCode& code,
-    std::size_t known_crossingless_components = 0);
-
 PDCODE_SIMPLIFY_API PDSimplificationResult simplify_pd_code(
     const PDCode& code,
     std::size_t known_crossingless_components = 0);

{cpp_pd_code_simplify_interface-0.1.5 → cpp_pd_code_simplify_interface-0.1.7}/cpp_pd_code_simplify_interface/data/src/native_interface.cpp

@@ -2,7 +2,9 @@
 
 #include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <exception>
+#include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <string>
@@ -10,6 +12,24 @@
 
 namespace {
 
+std::string local_timestamp() {
+    const std::time_t now = std::time(nullptr);
+    std::tm local{};
+#if defined(_WIN32)
+    localtime_s(&local, &now);
+#else
+    localtime_r(&now, &local);
+#endif
+    std::ostringstream out;
+    out << std::put_time(&local, "%Y-%m-%d %H:%M:%S");
+    return out.str();
+}
+
+void print_progress_log(const std::string& message) {
+    std::cerr << "[pdcode-simplify " << local_timestamp() << "] "
+              << message << '\n';
+}
+
 bool denotes_crossingless_unknot(const std::string& text) {
     std::string compact;
     for (char c : text) {
@@ -129,7 +149,7 @@ char* pdcode_simplify_run_json(
         options.ban_heuristic = ban_heuristic != 0;
         options.verbose = verbose != 0;
         options.progress = [](const std::string& message) {
-            std::cerr << "[pdcode-simplify] " << message << '\n';
+            print_progress_log(message);
         };
 
         const pdcode_simplify::PDCode code = pdcode_simplify::parse_pd_code(text);

{cpp_pd_code_simplify_interface-0.1.5 → cpp_pd_code_simplify_interface-0.1.7}/cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp

@@ -110,31 +110,6 @@ void replace_label(PDCode& code, int old_label, int new_label) {
     }
 }
 
-void erase_crossings(PDCode& code, int first, int second = -1) {
-    if (second >= 0 && first > second) {
-        std::swap(first, second);
-    }
-    if (second >= 0) {
-        code.erase(code.begin() + second);
-    }
-    code.erase(code.begin() + first);
-}
-
-int label_occurrences_outside(const PDCode& code, int label, const std::set<int>& removed_crossings) {
-    int count = 0;
-    for (int crossing_index = 0; crossing_index < static_cast<int>(code.size()); ++crossing_index) {
-        if (removed_crossings.count(crossing_index) != 0) {
-            continue;
-        }
-        for (int strand = 0; strand < 4; ++strand) {
-            if (code[crossing_index][strand] == label) {
-                ++count;
-            }
-        }
-    }
-    return count;
-}
-
 int unique_label_count(const Crossing& crossing) {
     return static_cast<int>(std::set<int>(crossing.begin(), crossing.end()).size());
 }
@@ -2040,106 +2015,6 @@ bool apply_reverse_type_ii(PDCode& code, std::mt19937& rng) {
     return false;
 }
 
-bool apply_type_i_simplification(
-    PDCode& code,
-    std::size_t& crossingless_components,
-    int& type_i_moves) {
-    for (int crossing_index = 0; crossing_index < static_cast<int>(code.size()); ++crossing_index) {
-        const Crossing crossing = code[crossing_index];
-        for (int i = 0; i < 4; ++i) {
-            if (crossing[i] != crossing[(i + 1) % 4]) {
-                continue;
-            }
-
-            const ComponentAnalysis after_removal =
-                analyze_components_after_removing_crossings(
-                    code, std::vector<int>{crossing_index}, crossingless_components);
-            const int keep_label = crossing[(i + 2) % 4];
-            const int merge_label = crossing[(i + 3) % 4];
-            const std::set<int> removed{crossing_index};
-            if (keep_label == merge_label) {
-                if (label_occurrences_outside(code, keep_label, removed) != 0) {
-                    continue;
-                }
-            } else if (label_occurrences_outside(code, keep_label, removed) != 1 ||
-                       label_occurrences_outside(code, merge_label, removed) != 1) {
-                continue;
-            }
-
-            crossingless_components = after_removal.crossingless_components;
-            erase_crossings(code, crossing_index);
-            replace_label(code, merge_label, keep_label);
-            ++type_i_moves;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool apply_type_ii_simplification(
-    PDCode& code,
-    std::size_t& crossingless_components,
-    int& type_ii_moves) {
-    if (code.size() < 2) {
-        return false;
-    }
-
-    const LabelMap labels = build_label_map(code);
-    for (int first_crossing = 0; first_crossing < static_cast<int>(code.size()); ++first_crossing) {
-        for (int a = 0; a < 4; ++a) {
-            const Endpoint first_mate =
-                mate_endpoint(code, labels, Endpoint{first_crossing, a});
-            const Endpoint second_mate =
-                mate_endpoint(code, labels, Endpoint{first_crossing, (a + 1) % 4});
-            const int second_crossing = first_mate.crossing;
-            if (second_crossing == first_crossing || second_crossing != second_mate.crossing) {
-                continue;
-            }
-
-            const int b = first_mate.strand;
-            const int c = second_mate.strand;
-            if (positive_mod(b - 1, 4) != c || (a + b) % 2 != 0) {
-                continue;
-            }
-
-            const Crossing first = code[first_crossing];
-            const Crossing second = code[second_crossing];
-            const int keep_first = first[(a + 2) % 4];
-            const int merge_first = second[(b + 2) % 4];
-            const int keep_second = first[(a + 3) % 4];
-            const int merge_second = second[(b + 1) % 4];
-            const std::set<int> boundary_labels{
-                keep_first,
-                merge_first,
-                keep_second,
-                merge_second};
-            const std::set<int> removed_crossings{first_crossing, second_crossing};
-            if (boundary_labels.size() != 4 ||
-                label_occurrences_outside(code, keep_first, removed_crossings) != 1 ||
-                label_occurrences_outside(code, merge_first, removed_crossings) != 1 ||
-                label_occurrences_outside(code, keep_second, removed_crossings) != 1 ||
-                label_occurrences_outside(code, merge_second, removed_crossings) != 1) {
-                continue;
-            }
-
-            const ComponentAnalysis after_removal =
-                analyze_components_after_removing_crossings(
-                    code,
-                    std::vector<int>{first_crossing, second_crossing},
-                    crossingless_components);
-            crossingless_components = after_removal.crossingless_components;
-
-            erase_crossings(code, first_crossing, second_crossing);
-            replace_label(code, merge_first, keep_first);
-            replace_label(code, merge_second, keep_second);
-            ++type_ii_moves;
-            return true;
-        }
-    }
-
-    return false;
-}
-
 RandomInflationResult randomly_increase_crossings(
     const PDCode& code,
     const RandomInflationOptions& options) {
@@ -2172,28 +2047,6 @@ RandomInflationResult randomly_increase_crossings(
     return result;
 }
 
-ReidemeisterSimplificationResult simplify_reidemeister_i_ii(
-    const PDCode& code,
-    std::size_t known_crossingless_components) {
-    ReidemeisterSimplificationResult result;
-    result.code = code;
-    result.crossingless_components = known_crossingless_components;
-
-    while (true) {
-        if (apply_type_i_simplification(
-                result.code, result.crossingless_components, result.type_i_moves)) {
-            continue;
-        }
-        if (apply_type_ii_simplification(
-                result.code, result.crossingless_components, result.type_ii_moves)) {
-            continue;
-        }
-        break;
-    }
-
-    return result;
-}
-
 PDSimplificationResult simplify_pd_code(
     const PDCode& code,
     std::size_t known_crossingless_components) {

{cpp_pd_code_simplify_interface-0.1.5 → cpp_pd_code_simplify_interface-0.1.7}/pyproject.toml

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