improved dump_plan option and excluded cudd from style checking

speckdavid · Jun 30, 2023 · 5b1ac05 · 5b1ac05
1 parent abb9ce7
commit 5b1ac05
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/misc/style/run-all-style-checks.py b/misc/style/run-all-style-checks.py
@@ -45,7 +45,7 @@ def check_cc_files():
     Currently, we only check that there is no "std::" in .cc files.
     """
     search_dir = os.path.join(SRC_DIR, "search")
-    cc_files = utils.get_src_files(search_dir, (".cc",))
+    cc_files = utils.get_src_files(search_dir, (".cc",), ignore_dirs=["cudd-3.0.0"])
     print("Checking style of {} *.cc files".format(len(cc_files)))
     return subprocess.call(["./check-cc-file.py"] + cc_files, cwd=DIR) == 0
 

diff --git a/misc/style/run-uncrustify.py b/misc/style/run-uncrustify.py
@@ -41,7 +41,7 @@ def main():
     args = parse_args()
     if not args.force and args.modify and search_files_are_dirty():
         sys.exit(f"Error: {SEARCH_DIR} has uncommited changes.")
-    src_files = utils.get_src_files(SEARCH_DIR, (".h", ".cc"))
+    src_files = utils.get_src_files(SEARCH_DIR, (".h", ".cc"), ignore_dirs=["cudd-3.0.0"])
     print(f"Checking {len(src_files)} files with uncrustify.")
     config_file = os.path.join(REPO, ".uncrustify.cfg")
     executable = "uncrustify"

diff --git a/src/search/symbolic/plan_selection/plan_selector.cc b/src/search/symbolic/plan_selection/plan_selector.cc
@@ -144,7 +144,7 @@ void PlanSelector::save_accepted_plan(const Plan &plan) {
     num_accepted_plans++;
 
     if (dump_plans) {
-        utils::g_log << endl << "Plan " << num_accepted_plans << ":" << endl;
+        utils::g_log << endl << "New plan " << num_accepted_plans << ":" << endl;
     }
     plan_mgr.save_plan(plan, state_registry->get_task_proxy(), dump_plans, num_desired_plans > 1);
 }

diff --git a/src/search/symbolic/plan_selection/unordered_selector.cc b/src/search/symbolic/plan_selection/unordered_selector.cc
@@ -35,7 +35,7 @@ void UnorderedSelector::save_accepted_plan(const Plan &ordered_plan, const Plan
     num_accepted_plans++;
 
     if (dump_plans) {
-        utils::g_log << endl << "Ordered plan " << num_accepted_plans << ":" << endl;
+        utils::g_log << endl << "New plan " << num_accepted_plans << ":" << endl;
     }
     plan_mgr.save_plan(ordered_plan, state_registry->get_task_proxy(), dump_plans, num_desired_plans > 1);
 }