Skip to content

Add optional timeout parameter to subgraph isomorphism searches. #271

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

Closed
cqc-alec wants to merge 2 commits into from
Closed

Add optional timeout parameter to subgraph isomorphism searches. #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f286d13
Add optional timeout parameter to subgraph isomorphism searches.
cqc-alec Jul 6, 2021
eceff71
Link with `boost::chrono` library.
cqc-alec Jul 6, 2021
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ target_link_libraries(boost_graph
Boost::assert
Boost::bimap
Boost::bind
Boost::chrono
Boost::concept_check
Boost::config
Boost::container_hash
Expand Down
72 changes: 46 additions & 26 deletions include/boost/graph/vf2_sub_graph_iso.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include <utility>

#include <boost/assert.hpp>
#include <boost/chrono.hpp>
#include <boost/chrono/duration.hpp>
#include <boost/chrono/system_clocks.hpp>
#include <boost/concept/assert.hpp>
#include <boost/concept_check.hpp>
#include <boost/graph/graph_utility.hpp>
Expand Down Expand Up @@ -749,7 +752,7 @@ namespace detail
// mapping is found, the mapping is output to user_callback in the form
// of a correspondence map (graph1 to graph2). Returning false from the
// user_callback will terminate the search. Function match will return
// true if the entire search space was explored.
// true if a match was found.
template < typename Graph1, typename Graph2, typename IndexMap1,
typename IndexMap2, typename VertexOrder1,
typename EdgeEquivalencePredicate, typename VertexEquivalencePredicate,
Expand All @@ -758,7 +761,7 @@ namespace detail
SubGraphIsoMapCallback user_callback, const VertexOrder1& vertex_order1,
state< Graph1, Graph2, IndexMap1, IndexMap2, EdgeEquivalencePredicate,
VertexEquivalencePredicate, SubGraphIsoMapCallback,
problem_selection >& s)
problem_selection >& s, long timeout_ms=0)
{

typename VertexOrder1::const_iterator graph1_verts_iter;
Expand All @@ -771,8 +774,14 @@ namespace detail
match_continuation_type;
std::vector< match_continuation_type > k;
bool found_match = false;

bool have_timeout = timeout_ms > 0;
const boost::chrono::steady_clock::time_point end_time =
boost::chrono::steady_clock::now()
+ boost::chrono::milliseconds(timeout_ms);
recur:
if (have_timeout && boost::chrono::steady_clock::now() >= end_time)
return found_match;

if (s.success())
{
if (!s.call_back(user_callback))
Expand Down Expand Up @@ -924,7 +933,7 @@ namespace detail
IndexMapSmall index_map_small, IndexMapLarge index_map_large,
const VertexOrderSmall& vertex_order_small,
EdgeEquivalencePredicate edge_comp,
VertexEquivalencePredicate vertex_comp)
VertexEquivalencePredicate vertex_comp, long timeout_ms=0)
{

// Graph requirements
Expand Down Expand Up @@ -1007,7 +1016,8 @@ namespace detail
edge_comp, vertex_comp);

return detail::match(
graph_small, graph_large, user_callback, vertex_order_small, s);
graph_small, graph_large, user_callback, vertex_order_small, s,
timeout_ms);
}

} // namespace detail
Expand All @@ -1029,7 +1039,7 @@ vertex_order_by_mult(const Graph& graph)

// Enumerates all graph sub-graph monomorphism mappings between graphs
// graph_small and graph_large. Continues until user_callback returns true or
// the search space has been fully explored.
// the search space has been fully explored or the timeout (if > 0) is reached.
template < typename GraphSmall, typename GraphLarge, typename IndexMapSmall,
typename IndexMapLarge, typename VertexOrderSmall,
typename EdgeEquivalencePredicate, typename VertexEquivalencePredicate,
Expand All @@ -1038,23 +1048,25 @@ bool vf2_subgraph_mono(const GraphSmall& graph_small,
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback,
IndexMapSmall index_map_small, IndexMapLarge index_map_large,
const VertexOrderSmall& vertex_order_small,
EdgeEquivalencePredicate edge_comp, VertexEquivalencePredicate vertex_comp)
EdgeEquivalencePredicate edge_comp, VertexEquivalencePredicate vertex_comp,
long timeout_ms=0)
{
return detail::vf2_subgraph_morphism< detail::subgraph_mono >(graph_small,
graph_large, user_callback, index_map_small, index_map_large,
vertex_order_small, edge_comp, vertex_comp);
vertex_order_small, edge_comp, vertex_comp, timeout_ms);
}

// All default interface for vf2_subgraph_iso
template < typename GraphSmall, typename GraphLarge,
typename SubGraphIsoMapCallback >
bool vf2_subgraph_mono(const GraphSmall& graph_small,
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback)
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback,
long timeout_ms=0)
{
return vf2_subgraph_mono(graph_small, graph_large, user_callback,
get(vertex_index, graph_small), get(vertex_index, graph_large),
vertex_order_by_mult(graph_small), always_equivalent(),
always_equivalent());
always_equivalent(), timeout_ms);
}

// Named parameter interface of vf2_subgraph_iso
Expand All @@ -1064,7 +1076,7 @@ template < typename GraphSmall, typename GraphLarge, typename VertexOrderSmall,
bool vf2_subgraph_mono(const GraphSmall& graph_small,
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback,
const VertexOrderSmall& vertex_order_small,
const bgl_named_params< Param, Tag, Rest >& params)
const bgl_named_params< Param, Tag, Rest >& params, long timeout_ms=0)
{
return vf2_subgraph_mono(graph_small, graph_large, user_callback,
choose_const_pmap(
Expand All @@ -1075,12 +1087,13 @@ bool vf2_subgraph_mono(const GraphSmall& graph_small,
choose_param(
get_param(params, edges_equivalent_t()), always_equivalent()),
choose_param(
get_param(params, vertices_equivalent_t()), always_equivalent()));
get_param(params, vertices_equivalent_t()), always_equivalent()),
timeout_ms);
}

// Enumerates all graph sub-graph isomorphism mappings between graphs
// graph_small and graph_large. Continues until user_callback returns true or
// the search space has been fully explored.
// the search space has been fully explored or the timeout (if > 0) is reached.
template < typename GraphSmall, typename GraphLarge, typename IndexMapSmall,
typename IndexMapLarge, typename VertexOrderSmall,
typename EdgeEquivalencePredicate, typename VertexEquivalencePredicate,
Expand All @@ -1089,24 +1102,26 @@ bool vf2_subgraph_iso(const GraphSmall& graph_small,
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback,
IndexMapSmall index_map_small, IndexMapLarge index_map_large,
const VertexOrderSmall& vertex_order_small,
EdgeEquivalencePredicate edge_comp, VertexEquivalencePredicate vertex_comp)
EdgeEquivalencePredicate edge_comp, VertexEquivalencePredicate vertex_comp,
long timeout_ms=0)
{
return detail::vf2_subgraph_morphism< detail::subgraph_iso >(graph_small,
graph_large, user_callback, index_map_small, index_map_large,
vertex_order_small, edge_comp, vertex_comp);
vertex_order_small, edge_comp, vertex_comp, timeout_ms);
}

// All default interface for vf2_subgraph_iso
template < typename GraphSmall, typename GraphLarge,
typename SubGraphIsoMapCallback >
bool vf2_subgraph_iso(const GraphSmall& graph_small,
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback)
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback,
long timeout_ms=0)
{

return vf2_subgraph_iso(graph_small, graph_large, user_callback,
get(vertex_index, graph_small), get(vertex_index, graph_large),
vertex_order_by_mult(graph_small), always_equivalent(),
always_equivalent());
always_equivalent(), timeout_ms);
}

// Named parameter interface of vf2_subgraph_iso
Expand All @@ -1116,7 +1131,7 @@ template < typename GraphSmall, typename GraphLarge, typename VertexOrderSmall,
bool vf2_subgraph_iso(const GraphSmall& graph_small,
const GraphLarge& graph_large, SubGraphIsoMapCallback user_callback,
const VertexOrderSmall& vertex_order_small,
const bgl_named_params< Param, Tag, Rest >& params)
const bgl_named_params< Param, Tag, Rest >& params, long timeout_ms=0)
{

return vf2_subgraph_iso(graph_small, graph_large, user_callback,
Expand All @@ -1128,20 +1143,22 @@ bool vf2_subgraph_iso(const GraphSmall& graph_small,
choose_param(
get_param(params, edges_equivalent_t()), always_equivalent()),
choose_param(
get_param(params, vertices_equivalent_t()), always_equivalent()));
get_param(params, vertices_equivalent_t()), always_equivalent()),
timeout_ms);
}

// Enumerates all isomorphism mappings between graphs graph1_ and graph2_.
// Continues until user_callback returns true or the search space has been
// fully explored.
// fully explored or the timeout (if > 0) is reached.
template < typename Graph1, typename Graph2, typename IndexMap1,
typename IndexMap2, typename VertexOrder1,
typename EdgeEquivalencePredicate, typename VertexEquivalencePredicate,
typename GraphIsoMapCallback >
bool vf2_graph_iso(const Graph1& graph1, const Graph2& graph2,
GraphIsoMapCallback user_callback, IndexMap1 index_map1,
IndexMap2 index_map2, const VertexOrder1& vertex_order1,
EdgeEquivalencePredicate edge_comp, VertexEquivalencePredicate vertex_comp)
EdgeEquivalencePredicate edge_comp, VertexEquivalencePredicate vertex_comp,
long timeout_ms=0)
{

// Graph requirements
Expand Down Expand Up @@ -1210,26 +1227,28 @@ bool vf2_graph_iso(const Graph1& graph1, const Graph2& graph2,
GraphIsoMapCallback, detail::isomorphism >
s(graph1, graph2, index_map1, index_map2, edge_comp, vertex_comp);

return detail::match(graph1, graph2, user_callback, vertex_order1, s);
return detail::match(graph1, graph2, user_callback, vertex_order1, s,
timeout_ms);
}

// All default interface for vf2_graph_iso
template < typename Graph1, typename Graph2, typename GraphIsoMapCallback >
bool vf2_graph_iso(const Graph1& graph1, const Graph2& graph2,
GraphIsoMapCallback user_callback)
GraphIsoMapCallback user_callback, long timeout_ms=0)
{

return vf2_graph_iso(graph1, graph2, user_callback,
get(vertex_index, graph1), get(vertex_index, graph2),
vertex_order_by_mult(graph1), always_equivalent(), always_equivalent());
vertex_order_by_mult(graph1), always_equivalent(), always_equivalent(),
timeout_ms);
}

// Named parameter interface of vf2_graph_iso
template < typename Graph1, typename Graph2, typename VertexOrder1,
typename GraphIsoMapCallback, typename Param, typename Tag, typename Rest >
bool vf2_graph_iso(const Graph1& graph1, const Graph2& graph2,
GraphIsoMapCallback user_callback, const VertexOrder1& vertex_order1,
const bgl_named_params< Param, Tag, Rest >& params)
const bgl_named_params< Param, Tag, Rest >& params, long timeout_ms=0)
{

return vf2_graph_iso(graph1, graph2, user_callback,
Expand All @@ -1241,7 +1260,8 @@ bool vf2_graph_iso(const Graph1& graph1, const Graph2& graph2,
choose_param(
get_param(params, edges_equivalent_t()), always_equivalent()),
choose_param(
get_param(params, vertices_equivalent_t()), always_equivalent()));
get_param(params, vertices_equivalent_t()), always_equivalent()),
timeout_ms);
}

// Verifies a graph (sub)graph isomorphism map
Expand Down