@@ -517,7 +517,7 @@ bool MCF1stPass::EliminateCycles(PathVector &path, NodeID origin_id, NodeID next
|
||||
bool MCF1stPass::EliminateCycles()
|
||||
{
|
||||
bool cycles_found = false;
|
||||
uint16 size = this->job.Size();
|
||||
uint16_t size = this->job.Size();
|
||||
PathVector path(size, nullptr);
|
||||
for (NodeID node = 0; node < size; ++node) {
|
||||
/* Starting at each node in the graph find all cycles involving this
|
||||
@@ -535,7 +535,7 @@ bool MCF1stPass::EliminateCycles()
|
||||
MCF1stPass::MCF1stPass(LinkGraphJob &job) : MultiCommodityFlow(job)
|
||||
{
|
||||
PathVector paths;
|
||||
uint16 size = job.Size();
|
||||
uint16_t size = job.Size();
|
||||
uint accuracy = job.Settings().accuracy;
|
||||
bool more_loops;
|
||||
std::vector<bool> finished_sources(size);
|
||||
@@ -543,7 +543,7 @@ MCF1stPass::MCF1stPass(LinkGraphJob &job) : MultiCommodityFlow(job)
|
||||
uint min_step_size = 1;
|
||||
const uint adjust_threshold = 50;
|
||||
if (size >= adjust_threshold) {
|
||||
uint64 total_demand = 0;
|
||||
uint64_t total_demand = 0;
|
||||
uint demand_count = 0;
|
||||
for (NodeID source = 0; source < size; ++source) {
|
||||
const Node &node = job[source];
|
||||
@@ -603,7 +603,7 @@ MCF2ndPass::MCF2ndPass(LinkGraphJob &job) : MultiCommodityFlow(job)
|
||||
{
|
||||
this->max_saturation = UINT_MAX; // disable artificial cap on saturation
|
||||
PathVector paths;
|
||||
uint16 size = job.Size();
|
||||
uint16_t size = job.Size();
|
||||
uint accuracy = job.Settings().accuracy;
|
||||
bool demand_left = true;
|
||||
std::vector<bool> finished_sources(size);
|
||||
|
||||
Reference in New Issue
Block a user