large rewrite in the documentation/headers; changed implementation of the ForbiddenInterval constraints, renamed to NotMember; remove unused mode in sat; rewrite of internals of glop; change callbacks to std::function in shortestpath.h; random sync with interval code

This commit is contained in:
Laurent Perron
2016-06-02 13:19:10 +02:00
parent 938372bc47
commit 95b14628f1
113 changed files with 3738 additions and 2313 deletions

View File

@@ -478,11 +478,9 @@ class NetworkRoutingSolver {
for (int demand_index = 0; demand_index < num_demands; ++demand_index) {
paths.clear();
const Demand& demand = demands_array_[demand_index];
ResultCallback2<int64, int, int>* const graph_callback =
NewPermanentCallback(this, &NetworkRoutingSolver::HasArc);
CHECK(DijkstraShortestPath(num_nodes_, demand.source, demand.destination,
graph_callback, kDisconnectedDistance,
&paths));
[this](int x, int y) { return HasArc(x, y); },
kDisconnectedDistance, &paths));
all_min_path_lengths_.push_back(paths.size() - 1);
}