Run clang-format
This commit is contained in:
@@ -74,8 +74,11 @@ class Contractor
|
||||
// using ContractorHeap = util::BinaryHeap<NodeID, NodeID, int, ContractorHeapData,
|
||||
// ArrayStorage<NodeID, NodeID>
|
||||
// >;
|
||||
using ContractorHeap =
|
||||
util::BinaryHeap<NodeID, NodeID, int, ContractorHeapData, util::XORFastHashStorage<NodeID, NodeID>>;
|
||||
using ContractorHeap = util::BinaryHeap<NodeID,
|
||||
NodeID,
|
||||
int,
|
||||
ContractorHeapData,
|
||||
util::XORFastHashStorage<NodeID, NodeID>>;
|
||||
using ContractorEdge = ContractorGraph::InputEdge;
|
||||
|
||||
struct ContractorThreadData
|
||||
@@ -258,7 +261,8 @@ class Contractor
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// util::SimpleLogger().Write() << "edges at node with id " << highestNode << " has degree
|
||||
// util::SimpleLogger().Write() << "edges at node with id " << highestNode << " has
|
||||
// degree
|
||||
// " << maxdegree;
|
||||
// for(unsigned i = contractor_graph->BeginEdges(highestNode); i <
|
||||
// contractor_graph->EndEdges(highestNode); ++i) {
|
||||
@@ -345,9 +349,10 @@ class Contractor
|
||||
if (!flushed_contractor && (number_of_contracted_nodes >
|
||||
static_cast<NodeID>(number_of_nodes * 0.65 * core_factor)))
|
||||
{
|
||||
util::DeallocatingVector<ContractorEdge> new_edge_set; // this one is not explicitely
|
||||
// cleared since it goes out of
|
||||
// scope anywa
|
||||
util::DeallocatingVector<ContractorEdge>
|
||||
new_edge_set; // this one is not explicitely
|
||||
// cleared since it goes out of
|
||||
// scope anywa
|
||||
std::cout << " [flush " << number_of_contracted_nodes << " nodes] " << std::flush;
|
||||
|
||||
// Delete old heap data to free memory that we need for the coming operations
|
||||
@@ -595,7 +600,8 @@ class Contractor
|
||||
// avgdegree /= std::max((unsigned)1,(unsigned)remaining_nodes.size() );
|
||||
// quaddegree /= std::max((unsigned)1,(unsigned)remaining_nodes.size() );
|
||||
//
|
||||
// util::SimpleLogger().Write() << "rest: " << remaining_nodes.size() << ", max: "
|
||||
// util::SimpleLogger().Write() << "rest: " << remaining_nodes.size() << ",
|
||||
// max: "
|
||||
// << maxdegree << ", min: " << mindegree << ", avg: " << avgdegree << ",
|
||||
// quad: " << quaddegree;
|
||||
|
||||
@@ -639,7 +645,8 @@ class Contractor
|
||||
}
|
||||
|
||||
util::SimpleLogger().Write() << "[core] " << remaining_nodes.size() << " nodes "
|
||||
<< contractor_graph->GetNumberOfEdges() << " edges." << std::endl;
|
||||
<< contractor_graph->GetNumberOfEdges() << " edges."
|
||||
<< std::endl;
|
||||
|
||||
thread_data_list.data.clear();
|
||||
}
|
||||
@@ -1067,7 +1074,6 @@ class Contractor
|
||||
std::vector<bool> is_core_node;
|
||||
util::XORFastHash fast_hash;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,6 @@ struct ContractorOptions
|
||||
|
||||
static void GenerateOutputFilesNames(ContractorConfig &extractor_config);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -119,7 +119,6 @@ struct RangebasedCRC32
|
||||
private:
|
||||
IteratorbasedCRC32 crc32;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,21 +47,22 @@ class Prepare
|
||||
void WriteCoreNodeMarker(std::vector<bool> &&is_core_node) const;
|
||||
void WriteNodeLevels(std::vector<float> &&node_levels) const;
|
||||
void ReadNodeLevels(std::vector<float> &contraction_order) const;
|
||||
std::size_t WriteContractedGraph(unsigned number_of_edge_based_nodes,
|
||||
const util::DeallocatingVector<QueryEdge> &contracted_edge_list);
|
||||
std::size_t
|
||||
WriteContractedGraph(unsigned number_of_edge_based_nodes,
|
||||
const util::DeallocatingVector<QueryEdge> &contracted_edge_list);
|
||||
void FindComponents(unsigned max_edge_id,
|
||||
const util::DeallocatingVector<extractor::EdgeBasedEdge> &edges,
|
||||
std::vector<extractor::EdgeBasedNode> &nodes) const;
|
||||
|
||||
private:
|
||||
ContractorConfig config;
|
||||
std::size_t LoadEdgeExpandedGraph(const std::string &edge_based_graph_path,
|
||||
util::DeallocatingVector<extractor::EdgeBasedEdge> &edge_based_edge_list,
|
||||
const std::string &edge_segment_lookup_path,
|
||||
const std::string &edge_penalty_path,
|
||||
const std::string &segment_speed_path);
|
||||
std::size_t
|
||||
LoadEdgeExpandedGraph(const std::string &edge_based_graph_path,
|
||||
util::DeallocatingVector<extractor::EdgeBasedEdge> &edge_based_edge_list,
|
||||
const std::string &edge_segment_lookup_path,
|
||||
const std::string &edge_penalty_path,
|
||||
const std::string &segment_speed_path);
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,6 @@ struct QueryEdge
|
||||
data.id == right.data.id);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user