Backport some small changes from Scorpion.

driver/portfolio_runner.py

@@ -83,9 +83,10 @@ def compute_run_time(timeout, configs, pos):
     print("remaining time: {}".format(remaining_time))
     relative_time = configs[pos][0]
     remaining_relative_time = sum(config[0] for config in configs[pos:])
-    print("config {}: relative time {}, remaining {}".format(
-          pos, relative_time, remaining_relative_time))
-    return limits.round_time_limit(remaining_time * relative_time / remaining_relative_time)
+    absolute_time_limit = limits.round_time_limit(remaining_time * relative_time / remaining_relative_time)
+    print("config {}: relative time {}, remaining time {}, absolute time {}".format(
+          pos, relative_time, remaining_relative_time, absolute_time_limit))
+    return absolute_time_limit
 
 
 def run_sat_config(configs, pos, search_cost_type, heuristic_cost_type,
@@ -120,7 +121,7 @@ def run_sat(configs, executable, sas_file, plan_manager, final_config,
                 configs, pos, search_cost_type, heuristic_cost_type,
                 executable, sas_file, plan_manager, timeout, memory)
             if exitcode is None:
-                return
+                continue
 
             yield exitcode
             if exitcode == returncodes.SEARCH_UNSOLVABLE:

misc/style/run-all-style-checks.py

@@ -25,7 +25,7 @@ def check_python_style():
             "flake8",
             # https://flake8.pycqa.org/en/latest/user/error-codes.html
             "--extend-ignore", "E128,E129,E131,E261,E266,E301,E302,E305,E306,E402,E501,E741,F401",
-            "--exclude", "run-clang-tidy.py,txt2tags.py,.tox",
+            "--exclude", "run-clang-tidy.py,txt2tags.py,.tox,.venv",
             "src/translate/", "driver/", "misc/",
             "build.py", "build_configs.py", "fast-downward.py"], cwd=REPO)
     except FileNotFoundError:

misc/tox.ini

@@ -70,7 +70,6 @@ commands =
 
 [testenv:clang-tidy]
 changedir = {toxinidir}/style/
-deps = PyYAML==6.0.1
 commands =
   python run-clang-tidy.py
 

src/search/algorithms/int_packer.cc

@@ -1,5 +1,6 @@
 #include "int_packer.h"
 
+#include <algorithm>
 #include <cassert>
 
 using namespace std;
@@ -83,6 +84,8 @@ void IntPacker::set(Bin *buffer, int var, int value) const {
 
 void IntPacker::pack_bins(const vector<int> &ranges) {
     assert(var_infos.empty());
+    assert(all_of(ranges.begin(), ranges.end(),
+                  [](int range) {return range > 1;}));
 
     int num_vars = ranges.size();
     var_infos.resize(num_vars);

src/search/algorithms/named_vector.h

@@ -28,6 +28,10 @@ class NamedVector {
         elements.push_back(element);
     }
 
+    void push_back(T &&element) {
+        elements.push_back(std::move(element));
+    }
+
     T &operator[](int index) {
         return elements[index];
     }

src/search/operator_id.h

@@ -45,6 +45,10 @@ class OperatorID {
         return !(*this == other);
     }
 
+    bool operator<(const OperatorID &other) const {
+        return index < other.index;
+    }
+
     int hash() const {
         return index;
     }

src/search/task_utils/task_properties.cc

@@ -173,9 +173,11 @@ PerTaskInformation<int_packer::IntPacker> g_state_packers(
         vector<int> variable_ranges;
         variable_ranges.reserve(variables.size());
         for (VariableProxy var : variables) {
-            variable_ranges.push_back(var.get_domain_size());
+            /* IntPacker expects all variables to have at least a domain size of
+               two. This is not the case for some domain-abstracted tasks. */
+            int domain_size = max(2, var.get_domain_size());
+            variable_ranges.push_back(domain_size);
         }
         return utils::make_unique_ptr<int_packer::IntPacker>(variable_ranges);
-    }
-    );
+    });
 }