Issue454 - move computation of negated axioms to search component

src/search/CMakeLists.txt

@@ -682,6 +682,7 @@ create_fast_downward_library(
     SOURCES
         tasks/cost_adapted_task
         tasks/delegating_task
+        tasks/negated_axioms_task
         tasks/root_task
     CORE_LIBRARY
 )

src/search/heuristic.h

@@ -55,7 +55,8 @@ class Heuristic : public Evaluator {
     bool cache_evaluator_values;
 
     // Hold a reference to the task implementation and pass it to objects that need it.
-    const std::shared_ptr<AbstractTask> task;
+    // TODO: reinstate const if possible
+    std::shared_ptr<AbstractTask> task;
     // Use task_proxy to access task information.
     TaskProxy task_proxy;
 

src/search/heuristics/cea_heuristic.cc

@@ -5,6 +5,7 @@
 #include "../plugins/plugin.h"
 
 #include "../task_utils/task_properties.h"
+#include "../tasks/negated_axioms_task.h"
 #include "../utils/logging.h"
 
 #include <cassert>
@@ -412,6 +413,11 @@ ContextEnhancedAdditiveHeuristic::ContextEnhancedAdditiveHeuristic(
     const plugins::Options &opts)
     : Heuristic(opts),
       min_action_cost(task_properties::get_min_operator_cost(task_proxy)) {
+    if (task_properties::has_axioms(task_proxy)) {
+        task = make_shared<tasks::NegatedAxiomsTask>(tasks::NegatedAxiomsTask(task));
+        task_proxy = TaskProxy(*task);
+    }
+
     if (log.is_at_least_normal()) {
         log << "Initializing context-enhanced additive heuristic..." << endl;
     }

src/search/heuristics/cg_heuristic.cc

@@ -5,6 +5,7 @@
 
 #include "../plugins/plugin.h"
 #include "../task_utils/task_properties.h"
+#include "../tasks/negated_axioms_task.h"
 #include "../utils/logging.h"
 
 #include <algorithm>
@@ -22,6 +23,11 @@ CGHeuristic::CGHeuristic(const plugins::Options &opts)
       cache_misses(0),
       helpful_transition_extraction_counter(0),
       min_action_cost(task_properties::get_min_operator_cost(task_proxy)) {
+    if (task_properties::has_axioms(task_proxy)) {
+        task = make_shared<tasks::NegatedAxiomsTask>(tasks::NegatedAxiomsTask(task));
+        task_proxy = TaskProxy(*task);
+    }
+
     if (log.is_at_least_normal()) {
         log << "Initializing causal graph heuristic..." << endl;
     }

src/search/heuristics/relaxation_heuristic.cc

@@ -1,6 +1,7 @@
 #include "relaxation_heuristic.h"
 
 #include "../task_utils/task_properties.h"
+#include "../tasks/negated_axioms_task.h"
 #include "../utils/collections.h"
 #include "../utils/logging.h"
 #include "../utils/timer.h"
@@ -37,6 +38,11 @@ UnaryOperator::UnaryOperator(
 // construction and destruction
 RelaxationHeuristic::RelaxationHeuristic(const plugins::Options &opts)
     : Heuristic(opts) {
+    if (task_properties::has_axioms(task_proxy)) {
+        task = make_shared<tasks::NegatedAxiomsTask>(tasks::NegatedAxiomsTask(task));
+        task_proxy = TaskProxy(*task);
+    }
+
     // Build propositions.
     propositions.resize(task_properties::get_num_facts(task_proxy));
 

src/search/landmarks/landmark_heuristic.cc

@@ -7,7 +7,9 @@
 #include "../plugins/plugin.h"
 #include "../task_utils/successor_generator.h"
 #include "../tasks/cost_adapted_task.h"
+#include "../tasks/negated_axioms_task.h"
 #include "../tasks/root_task.h"
+#include "../task_utils/task_properties.h"
 #include "../utils/markup.h"
 
 using namespace std;
@@ -18,6 +20,10 @@ LandmarkHeuristic::LandmarkHeuristic(
     : Heuristic(opts),
       use_preferred_operators(opts.get<bool>("pref")),
       successor_generator(nullptr) {
+    if (task_properties::has_axioms(task_proxy)) {
+        task = make_shared<tasks::NegatedAxiomsTask>(tasks::NegatedAxiomsTask(task));
+        task_proxy = TaskProxy(*task);
+    }
 }
 
 void LandmarkHeuristic::initialize(const plugins::Options &opts) {
@@ -26,8 +32,10 @@ void LandmarkHeuristic::initialize(const plugins::Options &opts) {
       CostAdaptedTask *of the root task*, but there is currently no good
       way to do this, so we use this incomplete, slightly less safe test.
     */
+    // TODO: update comment and cerr message
     if (task != tasks::g_root_task
-        && dynamic_cast<tasks::CostAdaptedTask *>(task.get()) == nullptr) {
+        && dynamic_cast<tasks::CostAdaptedTask *>(task.get()) == nullptr
+        && dynamic_cast<tasks::NegatedAxiomsTask *>(task.get()) == nullptr) {
         cerr << "The landmark heuristics currently only support "
              << "task transformations that modify the operator costs. "
              << "See issues 845 and 686 for details." << endl;