Fixed a bug in the calculation of the lower bound in bidirectional se…

…arch when the minimum action cost is greater than 2. Some minor printing improvements.
speckdavid · Sep 18, 2023 · c97ce83 · c97ce83
1 parent 4978191
commit c97ce83
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/src/search/sdac_parser/catamorph/printer.h b/src/search/sdac_parser/catamorph/printer.h
@@ -47,7 +47,7 @@ class Printer {
         if (auto *o = Factories::get_as_equals(e))
             return Printer::print_op(*o, "==");
         if (auto *o = Factories::get_as_and(e))
-            return Printer::print_op(*o, "^");
+            return Printer::print_op(*o, "&&");
         if (auto *o = Factories::get_as_or(e))
             return Printer::print_op(*o, "||");
         if (auto *i = Factories::get_as_cst(e)) {

diff --git a/src/search/symbolic/original_state_space.cc b/src/search/symbolic/original_state_space.cc
@@ -34,7 +34,7 @@ OriginalStateSpace::OriginalStateSpace(
 
     init_mutex(task->get_mutex_groups());
     shared_ptr<extra_tasks::SdacTask> sdac_task = dynamic_pointer_cast<extra_tasks::SdacTask>(task);
-    utils::g_log << "Creating transition relations..." << flush;
+    utils::g_log << "Creating " << task->get_num_operators() << " transition relations..." << flush;
     if (sdac_task == nullptr) {
         create_single_trs();
     } else {

diff --git a/src/search/symbolic/searches/bidirectional_search.h b/src/search/symbolic/searches/bidirectional_search.h
@@ -30,8 +30,7 @@ class BidirectionalSearch : public SymSearch {
 
     virtual int getF() const override {
         return std::max<int>(std::max<int>(fw->getF(), bw->getF()),
-                             fw->getG() + bw->getG() +
-                             mgr->getAbsoluteMinTransitionCost());
+                             fw->getG() + bw->getG() + std::min(1, mgr->getAbsoluteMinTransitionCost()));
     }
 
     bool isExpFor(BidirectionalSearch *bdExp) const;

diff --git a/src/search/tasks/sdac_task.cc b/src/search/tasks/sdac_task.cc
@@ -2,6 +2,8 @@
 #include "../symbolic/sym_function_creator.h"
 #include "../symbolic/sym_variables.h"
 
+#include "../utils/logging.h"
+
 using namespace std;
 
 namespace extra_tasks {
@@ -26,6 +28,15 @@ SdacTask::SdacTask(const shared_ptr<AbstractTask> &parent, symbolic::SymVariable
 
     for (int op_id = 0; op_id < parent->get_num_operators(); ++op_id) {
         ADD cost_function = creator.create_add(parent->get_operator_cost_function(op_id, false));
+
+        double min_value = Cudd_V(cost_function.FindMin().getNode());
+        if (min_value < 0) {
+            utils::g_log << "Negative actions costs are note supported!" << endl;
+            utils::g_log << "Minimum action costs of operator " << parent->get_operator_name(op_id, false) <<
+                " is " << min_value << "." << endl;
+            utils::exit_with(utils::ExitCode::SEARCH_UNSUPPORTED);
+        }
+
         map<int, BDD> cost_cond;
         create_bdds_from_add(sym_vars, cost_function, cost_cond);
         for (auto pair : cost_cond) {