cpp-pd-code-simplify-interface 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

cpp_pd_code_simplify_interface/main.py

@@ -402,6 +402,9 @@ def _load_library() -> ctypes.CDLL:
         ctypes.c_char_p,
         ctypes.c_int,
         ctypes.c_int,
+        ctypes.c_int,
+        ctypes.c_int,
+        ctypes.c_int,
         ctypes.c_ulonglong,
         ctypes.POINTER(ctypes.c_int),
         ctypes.c_ulonglong,
@@ -419,9 +422,16 @@ def _run_one(
     *,
     max_paths: int = -1,
     ban_heuristic: bool = False,
+    reduction_round: int = -1,
+    max_thread: int = -1,
+    verbose: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> dict[str, Any]:
+    if reduction_round < -1:
+        raise ValueError("reduction_round must be -1 or a non-negative integer")
+    if max_thread < -1 or max_thread == 0:
+        raise ValueError("max_thread must be -1 or a positive integer")
     library = _load_library()
     removed_count = 0 if remove_crossings is None else len(remove_crossings)
     removed_array = None
@@ -432,6 +442,9 @@ def _run_one(
         pd_text.encode("utf-8"),
         int(max_paths),
         1 if ban_heuristic else 0,
+        int(reduction_round),
+        int(max_thread),
+        1 if verbose else 0,
         int(known_crossingless_components),
         removed_array,
         int(removed_count),
@@ -457,6 +470,9 @@ def simplify(
     *,
     max_paths: int = -1,
     ban_heuristic: bool = False,
+    reduction_round: int = -1,
+    max_thread: int = -1,
+    verbose: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> dict[str, Any]:
@@ -466,6 +482,9 @@ def simplify(
         normalize_pd_code(pd_code),
         max_paths=max_paths,
         ban_heuristic=ban_heuristic,
+        reduction_round=reduction_round,
+        max_thread=max_thread,
+        verbose=verbose,
         known_crossingless_components=known_crossingless_components,
         remove_crossings=remove_crossings,
     )
@@ -476,6 +495,9 @@ def simplify_many(
     *,
     max_paths: int = -1,
     ban_heuristic: bool = False,
+    reduction_round: int = -1,
+    max_thread: int = -1,
+    verbose: bool = False,
     known_crossingless_components: int = 0,
     remove_crossings: Optional[Sequence[int]] = None,
 ) -> list[dict[str, Any]]:
@@ -486,6 +508,9 @@ def simplify_many(
             pd_text,
             max_paths=max_paths,
             ban_heuristic=ban_heuristic,
+            reduction_round=reduction_round,
+            max_thread=max_thread,
+            verbose=verbose,
             known_crossingless_components=known_crossingless_components,
             remove_crossings=remove_crossings,
         )
@@ -496,16 +521,27 @@ def simplify_many(
 def main(argv: Optional[Sequence[str]] = None) -> int:
     parser = argparse.ArgumentParser(description="Run cpp-pd-code-simplify through the Python interface.")
     parser.add_argument("pd_code", nargs="?", help="PD code as PD[...] text or a Python-style list of crossings.")
+    parser.add_argument("--pd-code", "-c", dest="pd_code_option", help="literal PD[...] string")
     parser.add_argument("--pd-file", "-f", help="read one file containing one or more labelled PD-code lines")
     parser.add_argument("--max-paths", type=int, default=-1)
     parser.add_argument("--ban-heuristic", action="store_true")
+    parser.add_argument("--reduction-round", type=int, default=-1)
+    parser.add_argument("--max-thread", type=int, default=-1)
+    parser.add_argument("--verbose", action="store_true")
     parser.add_argument("--known-crossingless-components", type=int, default=0)
     parser.add_argument("--remove-crossings", help="comma-separated zero-based crossing indices")
     args = parser.parse_args(argv)
-    if args.pd_file and args.pd_code:
-        parser.error("pass either a positional PD code or --pd-file, not both")
-    if not args.pd_file and not args.pd_code:
-        parser.error("a positional PD code or --pd-file is required")
+    if args.reduction_round < -1:
+        parser.error("--reduction-round must be -1 or a non-negative integer")
+    if args.max_thread < -1 or args.max_thread == 0:
+        parser.error("--max-thread must be -1 or a positive integer")
+    if args.pd_code and args.pd_code_option:
+        parser.error("pass either a positional PD code or --pd-code, not both")
+    pd_code_text = args.pd_code_option or args.pd_code
+    if args.pd_file and pd_code_text:
+        parser.error("pass either a PD code or --pd-file, not both")
+    if not args.pd_file and not pd_code_text:
+        parser.error("a PD code or --pd-file is required")
     remove_crossings = None
     if args.remove_crossings:
         remove_crossings = [int(token) for token in re.findall(r"-?\d+", args.remove_crossings)]
@@ -521,6 +557,9 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
                     line,
                     max_paths=args.max_paths,
                     ban_heuristic=args.ban_heuristic,
+                    reduction_round=args.reduction_round,
+                    max_thread=args.max_thread,
+                    verbose=args.verbose,
                     known_crossingless_components=args.known_crossingless_components,
                     remove_crossings=remove_crossings,
                 )
@@ -536,9 +575,12 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
         payload: Any = batch_payload
     else:
         payload = simplify(
-            args.pd_code or "",
+            pd_code_text or "",
             max_paths=args.max_paths,
             ban_heuristic=args.ban_heuristic,
+            reduction_round=args.reduction_round,
+            max_thread=args.max_thread,
+            verbose=args.verbose,
             known_crossingless_components=args.known_crossingless_components,
             remove_crossings=remove_crossings,
         )

{cpp_pd_code_simplify_interface-0.1.2.dist-info → cpp_pd_code_simplify_interface-0.1.4.dist-info}/METADATA

@@ -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.dist-info → cpp_pd_code_simplify_interface-0.1.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
 cpp_pd_code_simplify_interface/__init__.py,sha256=aaNwD--zgQX13xiU1hpuvgXy8vVTFGRk-r5zLm8zIRY,447
 cpp_pd_code_simplify_interface/__main__.py,sha256=fdA1QWBe5LNX0fbtaJXa1-dwEhrg_4sS_5UnjaajcMo,80
-cpp_pd_code_simplify_interface/main.py,sha256=HE8PcsU14oLr0h2eDV1XPs4qEbczWtxV56SHYhVsC2M,18841
+cpp_pd_code_simplify_interface/main.py,sha256=_7dPNfbtUxAC8o9cZOOwicU04zIFIA55nHIzQ_UZunw,20624
 cpp_pd_code_simplify_interface/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-cpp_pd_code_simplify_interface-0.1.2.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
-cpp_pd_code_simplify_interface-0.1.2.dist-info/METADATA,sha256=p__9vFD-NVclC3MYNPw5u8GaojMtTzW7DnmlOIFtdXg,2706
-cpp_pd_code_simplify_interface-0.1.2.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
-cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp,sha256=U9hATgHFDEzjMoWowzih6QY89gFNn7BuMVVuBDEal4o,4080
-cpp_pd_code_simplify_interface/data/src/native_interface.cpp,sha256=njYbVAld8_4ZrbNiyCnEbX2oL9l10krp37ATMjwvM70,6877
-cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=SgyqoksJQYvn0UFfQoR-PJCMahA0x9NTLBaBn8NcZWQ,65822
-cpp_pd_code_simplify_interface-0.1.2.dist-info/RECORD,,
+cpp_pd_code_simplify_interface-0.1.4.dist-info/entry_points.txt,sha256=ThorC4Enxp317TKITsXm9pE0gUp7pt-pP6Dl5mEPUR8,91
+cpp_pd_code_simplify_interface-0.1.4.dist-info/METADATA,sha256=CIMcDMWX0fa01RY04zPmN-B1D_YSKCGyNRdVWoDIrHI,2905
+cpp_pd_code_simplify_interface-0.1.4.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+cpp_pd_code_simplify_interface/data/include/pdcode_simplify/pdcode_simplify.hpp,sha256=P8XgFxLelCFesArCrKJ_UwqG7LlpoXiegNHLOV-DhG8,5162
+cpp_pd_code_simplify_interface/data/src/native_interface.cpp,sha256=LnffzIhwbGbw4xDTp5QXd-Vx23Nc9y5Xgr0AdbULlF0,6077
+cpp_pd_code_simplify_interface/data/src/pdcode_simplify.cpp,sha256=ptDTjjSlx_Lq_2snHYWgjnIbr-mGsDG7rqTevuqoSEc,94195
+cpp_pd_code_simplify_interface-0.1.4.dist-info/RECORD,,