mirror of
https://github.com/Z3Prover/z3
synced 2025-10-05 15:33:59 +00:00
na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
40a79694ea
commit
d67bfd78b9
4 changed files with 39 additions and 15 deletions
|
@ -37,6 +37,7 @@ Features:
|
|||
- try optimization based on arithmetic solver.
|
||||
- earliest start, latest start
|
||||
- constraint level
|
||||
- add constraints gradually
|
||||
- resource groups
|
||||
- resource groups like a resource
|
||||
- resources bound to resource groups within time intervals
|
||||
|
@ -638,6 +639,9 @@ namespace smt {
|
|||
app_ref res(u.mk_resource(r), m);
|
||||
if (!ctx.e_internalized(res)) ctx.internalize(res, false);
|
||||
ri.m_resource = ctx.get_enode(res);
|
||||
app_ref ms(u.mk_makespan(r), m);
|
||||
if (!ctx.e_internalized(ms)) ctx.internalize(ms, false);
|
||||
ri.m_makespan = ctx.get_enode(ms);
|
||||
}
|
||||
ri.m_available.push_back(res_available(max_loadpct, start, end, ps));
|
||||
}
|
||||
|
@ -823,18 +827,19 @@ namespace smt {
|
|||
vector<res_available>& available = m_resources[r].m_available;
|
||||
unsigned lo = 0, hi = available.size(), mid = hi / 2;
|
||||
while (lo < hi) {
|
||||
SASSERT(lo <= mid && mid < hi);
|
||||
res_available const& ra = available[mid];
|
||||
if (ra.m_start <= t && t <= ra.m_end) {
|
||||
idx = mid;
|
||||
return true;
|
||||
}
|
||||
else if (ra.m_start > t && mid > 0) {
|
||||
hi = mid - 1;
|
||||
hi = mid;
|
||||
mid = lo + (mid - lo) / 2;
|
||||
}
|
||||
else if (ra.m_end < t) {
|
||||
lo = mid + 1;
|
||||
mid += (hi - mid) / 2;
|
||||
mid += (hi - mid + 1) / 2;
|
||||
}
|
||||
else {
|
||||
break;
|
||||
|
|
|
@ -91,7 +91,8 @@ namespace smt {
|
|||
vector<res_available> m_available; // time intervals where resource is available
|
||||
time_t m_end; // can't run after
|
||||
enode* m_resource;
|
||||
res_info(): m_end(std::numeric_limits<time_t>::max()), m_resource(nullptr) {}
|
||||
enode* m_makespan;
|
||||
res_info(): m_end(std::numeric_limits<time_t>::max()), m_resource(nullptr), m_makespan(nullptr) {}
|
||||
};
|
||||
|
||||
ast_manager& m;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue