diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmComputeComponentGraph.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmComputeComponentGraph.cxx')
-rw-r--r-- | Source/cmComputeComponentGraph.cxx | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/Source/cmComputeComponentGraph.cxx b/Source/cmComputeComponentGraph.cxx index 9cd780d..4f21c3a 100644 --- a/Source/cmComputeComponentGraph.cxx +++ b/Source/cmComputeComponentGraph.cxx @@ -15,8 +15,8 @@ #include <assert.h> -cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input): - InputGraph(input) +cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input) + : InputGraph(input) { // Identify components. this->Tarjan(); @@ -34,7 +34,7 @@ cmComputeComponentGraph::~cmComputeComponentGraph() void cmComputeComponentGraph::Tarjan() { int n = static_cast<int>(this->InputGraph.size()); - TarjanEntry entry = {0,0}; + TarjanEntry entry = { 0, 0 }; this->TarjanEntries.resize(0); this->TarjanEntries.resize(n, entry); this->TarjanComponents.resize(0); @@ -42,17 +42,15 @@ void cmComputeComponentGraph::Tarjan() this->TarjanWalkId = 0; this->TarjanVisited.resize(0); this->TarjanVisited.resize(n, 0); - for(int i = 0; i < n; ++i) - { + for (int i = 0; i < n; ++i) { // Start a new DFS from this node if it has never been visited. - if(!this->TarjanVisited[i]) - { + if (!this->TarjanVisited[i]) { assert(this->TarjanStack.empty()); ++this->TarjanWalkId; this->TarjanIndex = 0; this->TarjanVisit(i); - } } + } } void cmComputeComponentGraph::TarjanVisit(int i) @@ -68,41 +66,35 @@ void cmComputeComponentGraph::TarjanVisit(int i) // Follow outgoing edges. EdgeList const& nl = this->InputGraph[i]; - for(EdgeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni) - { + for (EdgeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni) { int j = *ni; // Ignore edges to nodes that have been reached by a previous DFS // walk. Since we did not reach the current node from that walk // it must not belong to the same component and it has already // been assigned to a component. - if(this->TarjanVisited[j] > 0 && - this->TarjanVisited[j] < this->TarjanWalkId) - { + if (this->TarjanVisited[j] > 0 && + this->TarjanVisited[j] < this->TarjanWalkId) { continue; - } + } // Visit the destination if it has not yet been visited. - if(!this->TarjanVisited[j]) - { + if (!this->TarjanVisited[j]) { this->TarjanVisit(j); - } + } // If the destination has not yet been assigned to a component, // check if it has a better root for the current object. - if(this->TarjanComponents[j] < 0) - { - if(this->TarjanEntries[this->TarjanEntries[j].Root].VisitIndex < - this->TarjanEntries[this->TarjanEntries[i].Root].VisitIndex) - { + if (this->TarjanComponents[j] < 0) { + if (this->TarjanEntries[this->TarjanEntries[j].Root].VisitIndex < + this->TarjanEntries[this->TarjanEntries[i].Root].VisitIndex) { this->TarjanEntries[i].Root = this->TarjanEntries[j].Root; - } } } + } // Check if we have found a component. - if(this->TarjanEntries[i].Root == i) - { + if (this->TarjanEntries[i].Root == i) { // Yes. Create it. int c = static_cast<int>(this->Components.size()); this->Components.push_back(NodeList()); @@ -110,8 +102,7 @@ void cmComputeComponentGraph::TarjanVisit(int i) // Populate the component list. int j; - do - { + do { // Get the next member of the component. j = this->TarjanStack.top(); this->TarjanStack.pop(); @@ -122,11 +113,11 @@ void cmComputeComponentGraph::TarjanVisit(int i) // Store the node in its component. component.push_back(j); - } while(j != i); + } while (j != i); // Sort the component members for clarity. std::sort(component.begin(), component.end()); - } + } } void cmComputeComponentGraph::TransferEdges() @@ -134,21 +125,18 @@ void cmComputeComponentGraph::TransferEdges() // Map inter-component edges in the original graph to edges in the // component graph. int n = static_cast<int>(this->InputGraph.size()); - for(int i=0; i < n; ++i) - { + for (int i = 0; i < n; ++i) { int i_component = this->TarjanComponents[i]; EdgeList const& nl = this->InputGraph[i]; - for(EdgeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni) - { + for (EdgeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni) { int j = *ni; int j_component = this->TarjanComponents[j]; - if(i_component != j_component) - { + if (i_component != j_component) { // We do not attempt to combine duplicate edges, but instead // store the inter-component edges with suitable multiplicity. this->ComponentGraph[i_component].push_back( cmGraphEdge(j_component, ni->IsStrong())); - } } } + } } |