OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Also return the number of vertices for each color from Welsh-Powell-Algorithm.

Browse Source
This commit is contained in:
Markus Blatt
2018-06-12 13:15:07 +02:00
parent a1650a58f4
commit 3953b20215
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
opm/autodiff/GraphColoring.hpp
View File

@@ -30,12 +30,13 @@ namespace Opm
namespace Detail
{
template<class Graph>
void colorGraphWelshPowell(const Graph& graph,
std::size_t colorGraphWelshPowell(const Graph& graph,
std::deque<typename Graph::VertexDescriptor>& orderedVertices,
std::vector<int>& colors,
int color, int noVertices)
{
std::vector<int> forbidden(noVertices, false);
std::size_t noColored = 0;
for(auto vertex = orderedVertices.begin(),
vertexEnd = orderedVertices.end();
@@ -51,6 +52,7 @@ void colorGraphWelshPowell(const Graph& graph,
// Color Vertex
colors[*vertex] = color;
++noColored;
// Forbid neighors
for(auto edge = graph.beginEdges(*vertex), endEdge = graph.endEdges(*vertex);
edge != endEdge; ++edge)
@@ -66,18 +68,20 @@ void colorGraphWelshPowell(const Graph& graph,
return !forbidden[vertex];
});
orderedVertices.resize(newEnd-orderedVertices.begin());
return noColored;
}
} // end namespace Detail
/// \brief Color the vertices of graph-
/// \brief Color the vertices of graph.
///
/// It uses the algorithm of Welsh and Powell for this.
/// \param graph The graph to color. Must adhere to the graph interface of dune-istl.
/// \return A pair of a vector with the colors of the vertices and the number of colors
/// assigned
template<class Graph>
std::tuple<std::vector<int>, int> colorVerticesWelshPowell(const Graph& graph)
std::tuple<std::vector<int>, int, std::vector<std::size_t> >
colorVerticesWelshPowell(const Graph& graph)
{
using Vertex = typename Graph::VertexDescriptor;
std::deque<Vertex> orderedVertices;
@@ -130,13 +134,16 @@ std::tuple<std::vector<int>, int> colorVerticesWelshPowell(const Graph& graph)
std::fill(colors.begin(), colors.end(), -1);
int color = 0;
std::vector<std::size_t> verticesPerColor;
verticesPerColor.reserve(10);
while(!orderedVertices.empty())
{
Detail::colorGraphWelshPowell(graph, orderedVertices, colors, color++,
noVertices);
verticesPerColor
.push_back(Detail::colorGraphWelshPowell(graph, orderedVertices, colors,
color++, noVertices));
}
return std::make_tuple(colors, color);
return std::make_tuple(colors, color, verticesPerColor);
}
}
// end namespace Opm