Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore broken test_basic_csr_directed_graph #374

Merged
merged 2 commits into from
May 9, 2024
Merged

Restore broken test_basic_csr_directed_graph #374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8150fa
Restore broken test_basic_csr_directed_graph
sehe Apr 20, 2024
2154398
Review comments
sehe May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 35 additions & 9 deletions test/graphviz_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
#include <boost/assign/std/map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/compressed_sparse_row_graph.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/property_map/function_property_map.hpp>

#include <boost/regex.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/property_map/dynamic_property_map.hpp>
Expand Down Expand Up @@ -376,19 +380,40 @@ void test_comments_embedded_in_strings()
BOOST_TEST((test_graph< graph_t >(gs, 2, mass_map_t(), weight_map_t())));
}

#if 0 // Currently broken
void test_basic_csr_directed_graph() {
void test_basic_csr_directed_graph()
{
weight_map_t weights;
insert( weights )(make_pair("a","b"),0.0)
(make_pair("c","d"),7.7)(make_pair("e","f"),6.66)
(make_pair("d","e"),0.5)(make_pair("e","a"),0.5);
insert(weights)(make_pair("a", "b"), 0.0)(make_pair("c", "d"), 7.7)(
make_pair("e", "f"), 6.66)(make_pair("d", "e"), 0.5)(
make_pair("e", "a"), 0.5);
gs_t gs("digraph { a -> b eDge [weight = 7.7] "
"c -> d e-> f [weight = 6.66] "
"c -> d e-> f [weight = 6.66] "
"d ->e->a [weight=.5]}");
typedef compressed_sparse_row_graph<directedS, vertex_p_bundled, edge_p_bundled, graph_p > graph_t;
BOOST_TEST((test_graph<graph_t>(gs,6,mass_map_t(),weights,"node_id","",&vertex_p_bundled::name,&vertex_p_bundled::color,&edge_p_bundled::weight)));
}
typedef compressed_sparse_row_graph< directedS, vertex_p_bundled,
edge_p_bundled, graph_p >
graph_t;
graph_t g;
#ifdef UNSTABLE_PROPERTY_MAPS_FIXED // https://github.com/boostorg/graph/issues/373
BOOST_TEST((test_graph(gs, g, 6, mass_map_t(), weights, "node_id", "",
get(&vertex_p_bundled::name, g), // Warning, currently broken
get(&vertex_p_bundled::color, g), // Warning, currently broken
get(&edge_p_bundled::weight, g)) // Warning, currently broken
));
#else
BOOST_TEST((test_graph(gs, g, 6, mass_map_t(), weights, "node_id",
"", //
boost::make_function_property_map< graph_t::vertex_descriptor >(
[&g](graph_t::vertex_descriptor v) -> std::string&
{ return g[v].name; }),
boost::make_function_property_map< graph_t::vertex_descriptor >(
[&g](graph_t::vertex_descriptor v) -> float&
{ return g[v].color; }),
boost::make_function_property_map< graph_t::edge_descriptor >(
[&g](graph_t::edge_descriptor e) -> double&
{ return g[e].weight; }) //
)));
#endif
}

void test_basic_csr_directed_graph_ext_props()
{
Expand Down Expand Up @@ -433,5 +458,6 @@ int main()
test_graph_property_test_3();
test_comments_embedded_in_strings();
test_basic_csr_directed_graph_ext_props();
test_basic_csr_directed_graph();
return boost::report_errors();
}
Loading