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:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user