Skip to content

Commit c583bfa

Browse files
jzmaddockjzmaddock
committed
Merge branch 'develop'
2 parents cea3ee8 + fa3bd05 commit c583bfa

11 files changed

+44
-19
lines changed

‎.drone.star

+2-5
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def main(ctx):
5151
linux_cxx("g++-9 17", "g++-9", packages="g++-9", buildtype="boost", image="cppalliance/droneubuntu1404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-9', 'CXXSTD': '17', }, globalenv=globalenv),
5252
linux_cxx("g++-9 2a", "g++-9", packages="g++-9", buildtype="boost", image="cppalliance/droneubuntu1404:1", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-9', 'CXXSTD': '2a', }, globalenv=globalenv),
5353

54-
linux_cxx("g++-10 03", "g++-10", packages="g++-10", image="cppalliance/droneubuntu2004:1", buildtype="boost", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-10', 'CXXSTD': '03', }, globalenv=globalenv),
5554
linux_cxx("g++-10 11", "g++-10", packages="g++-10", image="cppalliance/droneubuntu2004:1", buildtype="boost", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-10', 'CXXSTD': '11', }, globalenv=globalenv),
5655
linux_cxx("g++-10 14", "g++-10", packages="g++-10", image="cppalliance/droneubuntu2004:1", buildtype="boost", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-10', 'CXXSTD': '14', }, globalenv=globalenv),
5756
linux_cxx("g++-10 17", "g++-10", packages="g++-10", image="cppalliance/droneubuntu2004:1", buildtype="boost", environment={'TOOLSET': 'gcc', 'COMPILER': 'g++-10', 'CXXSTD': '17', }, globalenv=globalenv),
@@ -131,7 +130,7 @@ def main(ctx):
131130
osx_cxx("XCode-10.2 03", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
132131
osx_cxx("XCode-10.2 11", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
133132
osx_cxx("XCode-10.2 14", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
134-
osx_cxx("XCode-10.2 17", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '17', }, globalenv=globalenv),
133+
# osx_cxx("XCode-10.2 17", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '17', }, globalenv=globalenv),
135134
osx_cxx("XCode-10.2 2a", "clang++", packages="", buildtype="boost", xcode_version="10.2", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '2a', }, globalenv=globalenv),
136135

137136
osx_cxx("XCode-9.4 03", "clang++", packages="", buildtype="boost", xcode_version="9.4", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
@@ -152,12 +151,10 @@ def main(ctx):
152151
osx_cxx("XCode-8.0 03", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
153152
osx_cxx("XCode-8.0 11", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
154153
osx_cxx("XCode-8.0 14", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
155-
osx_cxx("XCode-8.0 1z", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
154+
# osx_cxx("XCode-8.0 1z", "clang++", packages="", buildtype="boost", xcode_version="8", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
156155

157156
osx_cxx("XCode-7.3 03", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '03', }, globalenv=globalenv),
158157
osx_cxx("XCode-7.3 11", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '11', }, globalenv=globalenv),
159-
osx_cxx("XCode-7.3 14", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '14', }, globalenv=globalenv),
160-
osx_cxx("XCode-7.3 1z", "clang++", packages="", buildtype="boost", xcode_version="7.3", environment={'TOOLSET': 'clang', 'COMPILER': 'clang++', 'CXXSTD': '1z', }, globalenv=globalenv),
161158
]
162159

163160
# from https://github.com/boostorg/boost-ci

‎.github/workflows/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
compiler: [ g++-9, g++-10, clang++-10 ]
15+
# Removed g++-10 because of an ICE; meant to be fixed in 10.2?
16+
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94938
17+
compiler: [ g++-9, clang++-10 ]
1618
steps:
1719
- uses: actions/checkout@v2
1820
with:
@@ -27,7 +29,7 @@ jobs:
2729
- name: Add repository
2830
run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
2931
- name: Install packages
30-
run: sudo apt install g++-9 g++-10 clang-10
32+
run: sudo apt install g++-9 clang-10
3133
- name: Checkout main boost
3234
run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
3335
- name: Update tools/boostdep
@@ -140,7 +142,7 @@ jobs:
140142
run: ../../../b2 toolset=${{ matrix.toolset }} cxxstd=03,11,14,17,2a define=CI_SUPPRESS_KNOWN_ISSUES
141143
working-directory: ../boost-root/libs/graph/test
142144
windows_msvc_14_0:
143-
runs-on: windows-latest
145+
runs-on: windows-2019
144146
defaults:
145147
run:
146148
shell: cmd
@@ -181,7 +183,7 @@ jobs:
181183
run: ..\..\..\b2 --hash address-model=64 cxxstd=14,17 toolset=msvc-14.0
182184
working-directory: ../boost-root/libs/graph/test
183185
windows_msvc_14_2:
184-
runs-on: windows-latest
186+
runs-on: windows-2019
185187
defaults:
186188
run:
187189
shell: cmd

‎doc/edge_coloring.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <H1>
5252
that no vertex connects with 2 edges of the same color. Furthermore
5353
at most m + 1 colors are used.
5454

55-
<!-- King, I.P. An automatic reordering scheme for simultaneous equations derived from network analysis. Int. J. Numer. Methods Engrg. 2 (1970), 523-533 -->
55+
<!-- Misra, J., & Gries, D. (1992). A constructive proof of Vizing's theorem. In Information Processing Letters. -->
5656

5757
<h3>Where defined</h3>
5858
<a href="../../../boost/graph/edge_coloring.hpp"><tt>boost/graph/edge_coloring.hpp</tt></a>
@@ -80,7 +80,7 @@ <h3>Parameters</h3>
8080
<h3>Example</h3>
8181

8282
See <A
83-
href="../example/edge_coloring.cpp"><tt>example/king_ordering.cpp</tt></A>.
83+
href="../example/edge_coloring.cpp"><tt>example/edge_coloring.cpp</tt></A>.
8484

8585
<h3>See Also</h3>
8686

‎doc/incident.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <H1><A NAME="sec:incident"></A>
4444
incident(typename graph_traits&lt;Graph&gt;::edge_descriptor e, Graph& g)
4545
</pre>
4646

47-
This function takes and edge descriptor and returns the pair of
47+
This function takes an edge descriptor and returns the pair of
4848
vertices that are <i>incident</i> to the edge. For directed graphs,
4949
the <tt>first</tt> vertex is the source and the <tt>second</tt> vertex
5050
is the target. This function is equivalent to the expression

‎doc/random_spanning_tree.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<p>
4040
The <tt>random_spanning_tree()</tt> function generates a random spanning tree
4141
on a directed or undirected graph. The algorithm used is Wilson's algorithm (<a
42-
href="bibliography.html#wilson96generating">73</a>, based on <!-- (FIXME: add
42+
href="bibliography.html#wilson96generating">73</a>), based on <!-- (FIXME: add
4343
documentation for loop_erased_random_walk()) <a
4444
href="loop_erased_random_walk.html"> -->loop-erased random walks<!-- </a> -->. There must
4545
be a path from every non-root vertex of the graph to the root;

‎doc/users.html

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ <h1>Boost Graph Library Users</h1>
4040
<li><a href="http://www.vrjuggler.org/">VR Juggler: Virtual Reality Tools</a></li>
4141
<li><a href="http://hyperworx.org">Hyperworx Platform Project</a></li>
4242
<li><a href="http://www.opencog.org/">OpenCog, an open source Artificial General Intelligence framework</a></li>
43+
<li><a href="https://www.pgRouting.org/">pgRouting extends the PostGIS/PostgreSQL geospatial database to provide geospatial routing functionality.</a></li>
4344
</ul>
4445

4546
</body>

‎include/boost/graph/boykov_kolmogorov_max_flow.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ boykov_kolmogorov_max_flow(Graph& g, CapacityEdgeMap cap,
977977
}
978978

979979
/**
980-
* non-named-parameter version, given capacity, residucal_capacity,
980+
* non-named-parameter version, given capacity, residual_capacity,
981981
* reverse_edges, and an index map.
982982
*/
983983
template < class Graph, class CapacityEdgeMap, class ResidualCapacityEdgeMap,

‎include/boost/graph/detail/adjacency_list.hpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -2069,15 +2069,20 @@ namespace detail
20692069
inline void reindex_edge_list(
20702070
EdgeList& el, vertex_descriptor u, boost::disallow_parallel_edge_tag)
20712071
{
2072-
for (typename EdgeList::iterator ei = el.begin(); ei != el.end(); ++ei)
2072+
typename EdgeList::iterator ei = el.begin(), e_end = el.end();
2073+
while (ei != e_end)
20732074
{
20742075
if (ei->get_target() > u)
20752076
{
20762077
typename EdgeList::value_type ce = *ei;
2078+
++ei;
20772079
el.erase(ce);
20782080
--ce.get_target();
20792081
el.insert(ce);
20802082
}
2083+
else {
2084+
++ei;
2085+
}
20812086
}
20822087
}
20832088
} // namespace detail

‎include/boost/graph/detail/geodesic.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ namespace detail
5555
(ReadablePropertyMapConcept< DistanceMap, Vertex >));
5656
BOOST_CONCEPT_ASSERT((NumericValueConcept< Distance >));
5757
typedef numeric_values< Distance > DistanceNumbers;
58-
BOOST_CONCEPT_ASSERT((AdaptableBinaryFunction< Combinator, Distance,
59-
Distance, Distance >));
58+
// NOTE: Disabled until this concept assert is fixed in Boost.ConceptCheck.
59+
// BOOST_CONCEPT_ASSERT((AdaptableBinaryFunction< Combinator, Distance,
60+
// Distance, Distance >));
6061

6162
// If there's ever an infinite distance, then we simply return
6263
// infinity. Note that this /will/ include the a non-zero

‎include/boost/graph/geodesic_distance.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ struct mean_geodesic_measure
2727
BOOST_CONCEPT_ASSERT((VertexListGraphConcept< Graph >));
2828
BOOST_CONCEPT_ASSERT((NumericValueConcept< DistanceType >));
2929
BOOST_CONCEPT_ASSERT((NumericValueConcept< ResultType >));
30-
BOOST_CONCEPT_ASSERT((AdaptableBinaryFunctionConcept< Divides,
31-
ResultType, ResultType, ResultType >));
30+
// NOTE: Disabled until this concept assert is fixed in Boost.ConceptCheck.
31+
// BOOST_CONCEPT_ASSERT((AdaptableBinaryFunctionConcept< Divides,
32+
// ResultType, ResultType, ResultType >));
3233

3334
return (d == base_type::infinite_distance())
3435
? base_type::infinite_result()

‎test/delete_edge.cpp

+18
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,23 @@ int main(int argc, char* argv[])
5555

5656
BOOST_TEST(m_graph[ed1] == EDGE_VAL);
5757

58+
// https://github.com/boostorg/graph/issues/268
59+
// 1. Undirected:
60+
{
61+
boost::adjacency_list<boost::setS, boost::vecS, boost::undirectedS> g;
62+
boost::add_edge(2, 0, g);
63+
boost::remove_vertex(1, g);
64+
BOOST_TEST(num_vertices(g) == 2);
65+
BOOST_TEST(num_edges(g) == 1);
66+
}
67+
// 2. Directed:
68+
{
69+
boost::adjacency_list<boost::setS, boost::vecS, boost::directedS> g;
70+
boost::add_edge(2, 0, g);
71+
boost::remove_vertex(1, g);
72+
BOOST_TEST(num_vertices(g) == 2);
73+
BOOST_TEST(num_edges(g) == 1);
74+
}
75+
5876
return boost::report_errors();
5977
}

0 commit comments

Comments
 (0)