Skip to content

Commit

Permalink
[trivial] Remove unused function from landmark factories.
Browse files Browse the repository at this point in the history
  • Loading branch information
ClemensBuechner authored Feb 7, 2024
1 parent db426cd commit 57f34f1
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 42 deletions.
7 changes: 0 additions & 7 deletions src/search/landmarks/landmark_factory.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ class LandmarkFactory {

std::shared_ptr<LandmarkGraph> compute_lm_graph(const std::shared_ptr<AbstractTask> &task);

/*
TODO: Currently reasonable orders are not supported for admissible landmark count
heuristics, which is why the heuristic needs to know whether the factory computes
reasonable orders. Once issue383 is dealt with we should be able to use reasonable
orders for admissible heuristics and this method can be removed.
*/
virtual bool computes_reasonable_orders() const = 0;
virtual bool supports_conditional_effects() const = 0;

bool achievers_are_calculated() const {
Expand Down
4 changes: 0 additions & 4 deletions src/search/landmarks/landmark_factory_h_m.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1008,10 +1008,6 @@ void LandmarkFactoryHM::generate_landmarks(
postprocess(task_proxy);
}

bool LandmarkFactoryHM::computes_reasonable_orders() const {
return false;
}

bool LandmarkFactoryHM::supports_conditional_effects() const {
return false;
}
Expand Down
1 change: 0 additions & 1 deletion src/search/landmarks/landmark_factory_h_m.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ class LandmarkFactoryHM : public LandmarkFactory {
public:
explicit LandmarkFactoryHM(const plugins::Options &opts);

virtual bool computes_reasonable_orders() const override;
virtual bool supports_conditional_effects() const override;
};
}
Expand Down
9 changes: 0 additions & 9 deletions src/search/landmarks/landmark_factory_merged.cc
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,6 @@ void LandmarkFactoryMerged::postprocess() {
lm_graph->set_landmark_ids();
}

bool LandmarkFactoryMerged::computes_reasonable_orders() const {
for (const shared_ptr<LandmarkFactory> &lm_factory : lm_factories) {
if (lm_factory->computes_reasonable_orders()) {
return true;
}
}
return false;
}

bool LandmarkFactoryMerged::supports_conditional_effects() const {
for (const shared_ptr<LandmarkFactory> &lm_factory : lm_factories) {
if (!lm_factory->supports_conditional_effects()) {
Expand Down
1 change: 0 additions & 1 deletion src/search/landmarks/landmark_factory_merged.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ class LandmarkFactoryMerged : public LandmarkFactory {
public:
explicit LandmarkFactoryMerged(const plugins::Options &opts);

virtual bool computes_reasonable_orders() const override;
virtual bool supports_conditional_effects() const override;
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,10 +349,6 @@ bool LandmarkFactoryReasonableOrdersHPS::effect_always_happens(
return eff.empty();
}

bool LandmarkFactoryReasonableOrdersHPS::computes_reasonable_orders() const {
return true;
}

bool LandmarkFactoryReasonableOrdersHPS::supports_conditional_effects() const {
return lm_factory->supports_conditional_effects();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class LandmarkFactoryReasonableOrdersHPS : public LandmarkFactory {
public:
LandmarkFactoryReasonableOrdersHPS(const plugins::Options &opts);

virtual bool computes_reasonable_orders() const override;
virtual bool supports_conditional_effects() const override;
};
}
Expand Down
4 changes: 0 additions & 4 deletions src/search/landmarks/landmark_factory_rpg_exhaust.cc
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ void LandmarkFactoryRpgExhaust::generate_relaxed_landmarks(
}
}

bool LandmarkFactoryRpgExhaust::computes_reasonable_orders() const {
return false;
}

bool LandmarkFactoryRpgExhaust::supports_conditional_effects() const {
return false;
}
Expand Down
1 change: 0 additions & 1 deletion src/search/landmarks/landmark_factory_rpg_exhaust.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class LandmarkFactoryRpgExhaust : public LandmarkFactoryRelaxation {
public:
explicit LandmarkFactoryRpgExhaust(const plugins::Options &opts);

virtual bool computes_reasonable_orders() const override;
virtual bool supports_conditional_effects() const override;
};
}
Expand Down
4 changes: 0 additions & 4 deletions src/search/landmarks/landmark_factory_rpg_sasp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -627,10 +627,6 @@ void LandmarkFactoryRpgSasp::discard_disjunctive_landmarks() {
}
}

bool LandmarkFactoryRpgSasp::computes_reasonable_orders() const {
return false;
}

bool LandmarkFactoryRpgSasp::supports_conditional_effects() const {
return true;
}
Expand Down
1 change: 0 additions & 1 deletion src/search/landmarks/landmark_factory_rpg_sasp.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ class LandmarkFactoryRpgSasp : public LandmarkFactoryRelaxation {
public:
explicit LandmarkFactoryRpgSasp(const plugins::Options &opts);

virtual bool computes_reasonable_orders() const override;
virtual bool supports_conditional_effects() const override;
};
}
Expand Down
4 changes: 0 additions & 4 deletions src/search/landmarks/landmark_factory_zhu_givan.cc
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,6 @@ void LandmarkFactoryZhuGivan::add_operator_to_triggers(const OperatorProxy &op)
triggers[lm.var][lm.value].push_back(op_or_axiom_id);
}

bool LandmarkFactoryZhuGivan::computes_reasonable_orders() const {
return false;
}

bool LandmarkFactoryZhuGivan::supports_conditional_effects() const {
return true;
}
Expand Down
1 change: 0 additions & 1 deletion src/search/landmarks/landmark_factory_zhu_givan.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ class LandmarkFactoryZhuGivan : public LandmarkFactoryRelaxation {
public:
explicit LandmarkFactoryZhuGivan(const plugins::Options &opts);

virtual bool computes_reasonable_orders() const override;
virtual bool supports_conditional_effects() const override;
};
}
Expand Down

0 comments on commit 57f34f1

Please sign in to comment.