summaryrefslogtreecommitdiff
path: root/src/theory/engine_output_channel.h
diff options
context:
space:
mode:
authorGereon Kremer <gereon.kremer@cs.rwth-aachen.de>2021-04-12 22:58:14 +0200
committerGitHub <noreply@github.com>2021-04-12 20:58:14 +0000
commitaf398235ef9f3a909991fddbb71d43434d6cf3a1 (patch)
tree8ae4533255a4bf63c808824f67552b588c301649 /src/theory/engine_output_channel.h
parentc422f03d3169d4dc8d5b333de12be14e9121bc93 (diff)
Refactor resource manager (#6322)
This PR does another round of refactoring of the resource manager and related code. - it moves the Resource enum out of the ResourceManager class - it treats the resources in a generic way (storing the statistics in a vector) instead of the manual treatment we had before - weights no longer live in the options, but in the ResourceManager and are changed accordingly in the ResourceManager constructor - following the generic treatment of resources, it also removes all the resource-specific options --x-step in favor of a generic --rweight name=weight - removed several unused methods from the ResourceManager Note that we handle the Resource enum in a way that allows to easily use other enums as additional resources, for example InferenceId. The general idea is that we will at some point have sensible default weights (so that the cumulative resources somewhat simulate the solver runtime) and users (almost) never need to modify them.
Diffstat (limited to 'src/theory/engine_output_channel.h')
-rw-r--r--src/theory/engine_output_channel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/theory/engine_output_channel.h b/src/theory/engine_output_channel.h
index 00f2f2acb..493edd512 100644
--- a/src/theory/engine_output_channel.h
+++ b/src/theory/engine_output_channel.h
@@ -46,7 +46,7 @@ class EngineOutputChannel : public theory::OutputChannel
public:
EngineOutputChannel(TheoryEngine* engine, theory::TheoryId theory);
- void safePoint(ResourceManager::Resource r) override;
+ void safePoint(Resource r) override;
void conflict(TNode conflictNode) override;
bool propagate(TNode literal) override;
@@ -61,7 +61,7 @@ class EngineOutputChannel : public theory::OutputChannel
void setIncomplete(IncompleteId id) override;
- void spendResource(ResourceManager::Resource r) override;
+ void spendResource(Resource r) override;
void handleUserAttribute(const char* attr, theory::Theory* t) override;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback