Add args.recursive

yuzie007 · Aug 7, 2024 · a26ad87 · a26ad87
1 parent c607dc4
commit a26ad87
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/ikdsplit/filler.py b/ikdsplit/filler.py
@@ -112,7 +112,10 @@ def run(args: argparse.Namespace) -> None:
         "min_order": args.order,
         "max_configurations": args.configurations,
     }
-    start_recursive(fill, criteria)
+    if args.recursive:
+        start_recursive(fill, criteria)
+    else:
+        fill()
 
 
 def main() -> None:

diff --git a/ikdsplit/regressor.py b/ikdsplit/regressor.py
@@ -101,7 +101,10 @@ def run(args: argparse.Namespace) -> None:
         "min_order": args.order,
         "max_configurations": args.configurations,
     }
-    start_recursive(regress, criteria)
+    if args.recursive:
+        start_recursive(regress, criteria)
+    else:
+        regress()
 
 
 def main() -> None:

diff --git a/ikdsplit/sorter.py b/ikdsplit/sorter.py
@@ -88,7 +88,10 @@ def run(args: argparse.Namespace) -> None:
         "min_order": args.order,
         "max_configurations": args.configurations,
     }
-    start_recursive(sort, criteria)
+    if args.recursive:
+        start_recursive(sort, criteria)
+    else:
+        sort()
 
 
 def main() -> None:

diff --git a/ikdsplit/splitter.py b/ikdsplit/splitter.py
@@ -144,6 +144,12 @@ def add_arguments(parser: argparse.ArgumentParser) -> None:
         type=int,
         help="maximum configurations to be checked",
     )
+    parser.add_argument(
+        "-r",
+        "--recursive",
+        action="store_true",
+        help="run recursively",
+    )
 
 
 def run(args: argparse.Namespace) -> None:

diff --git a/tests/test_fill.py b/tests/test_fill.py
@@ -17,5 +17,6 @@ def test_fill(data_path, tmp_path) -> None:
     for _ in fns:
         if (src / _).exists():
             shutil.copy2(src / _, tmp_path)
+
     with cd(tmp_path):
         assert subprocess.call(["ikdsplit", "fill"]) == 0
diff --git a/tests/test_run.py b/tests/test_run.py
@@ -20,8 +20,12 @@ def test_run(data_path: str, tmp_path) -> None:
         if (src / _).exists():
             shutil.copy2(src / _, tmp_path)
 
+    commands = [
+        ["ikdsplit", "split", "-r"],
+        ["ikdsplit", "fill", "-r", "-l", str(level)],
+        ["ikdsplit", "regress", "-r", "-l", str(level)],
+        ["ikdsplit", "sort", "-r", "-l", str(level)],
+    ]
     with cd(tmp_path):
-        assert subprocess.call(["ikdsplit", "split"]) == 0
-        assert subprocess.call(["ikdsplit", "fill", "-l", str(level)]) == 0
-        assert subprocess.call(["ikdsplit", "regress", "-l", str(level)]) == 0
-        assert subprocess.call(["ikdsplit", "sort", "-l", str(level)]) == 0
+        for command in commands:
+            assert subprocess.call(command) == 0