diff options
author | Gereon Kremer <gereon.kremer@cs.rwth-aachen.de> | 2021-04-12 22:58:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-12 20:58:14 +0000 |
commit | af398235ef9f3a909991fddbb71d43434d6cf3a1 (patch) | |
tree | 8ae4533255a4bf63c808824f67552b588c301649 /src/theory/bv/bv_solver_lazy.h | |
parent | c422f03d3169d4dc8d5b333de12be14e9121bc93 (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/bv/bv_solver_lazy.h')
-rw-r--r-- | src/theory/bv/bv_solver_lazy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/theory/bv/bv_solver_lazy.h b/src/theory/bv/bv_solver_lazy.h index db1d6c8a3..9129b1c69 100644 --- a/src/theory/bv/bv_solver_lazy.h +++ b/src/theory/bv/bv_solver_lazy.h @@ -125,7 +125,7 @@ class BVSolverLazy : public BVSolver Statistics d_statistics; void check(Theory::Effort e); - void spendResource(ResourceManager::Resource r); + void spendResource(Resource r); typedef std::unordered_set<TNode, TNodeHashFunction> TNodeSet; typedef std::unordered_set<Node, NodeHashFunction> NodeSet; |