Commit 307deccb authored by Ale Abdo's avatar Ale Abdo
Browse files

updates from master

parents e1e2f3c2 300d6f4a
......@@ -123,7 +123,7 @@ def parse_options(arguments = sys.argv[1:]):
["remove-edge-property", "PROPERTY", "remove the selected edge property", {}, "graph.RemoveEdgeProperty($PROPERTY)"],
["remove-graph-property", "PROPERTY", "remove the selected graph property", {}, "graph.RemoveGraphProperty($PROPERTY)"],
["insert-vertex-index-property", "PROPERTY", "insert vertex index as property", {}, "graph.InsertVertexIndexProperty($PROPERTY)"],
["insert-edge-index-property", "PROPERTY", "insert edge index as property", {}, "graph.InsertEdgeIndexProperty($PROPERTY"],
["insert-edge-index-property", "PROPERTY", "insert edge index as property", {}, "graph.InsertEdgeIndexProperty($PROPERTY)"],
["list-properties", None, "list all properties", {}, "graph.ListProperties()"],
["purge-vertices", None, "Remove all vertices of the graph which are currently being filtered out, and return to the unfiltered state",
{}, ["graph.PurgeVertices()", "graph.SetVertexFilterProperty('')" ]],
......
......@@ -71,12 +71,12 @@ GraphInterface::GraphInterface()
_vertex_index(get(vertex_index,_mg)),
_edge_index(get(edge_index_t(),_mg)),
_vertex_filter_map(_vertex_index),
_vertex_range(make_pair(numeric_limits<double>::min(), numeric_limits<double>::max())),
_vertex_range_include(make_pair(false, false)),
_vertex_range(make_pair(0.0, numeric_limits<double>::max())),
_vertex_range_include(make_pair(true, true)),
_vertex_range_invert(false),
_edge_filter_map(_edge_index),
_edge_range(make_pair(numeric_limits<double>::min(), numeric_limits<double>::max())),
_edge_range_include(make_pair(false, false)),
_edge_range(make_pair(0.0, numeric_limits<double>::max())),
_edge_range_include(make_pair(true, true)),
_edge_range_invert(false)
{
......@@ -125,8 +125,8 @@ void GraphInterface::SetVertexFilterProperty(string property)
else
{
_vertex_filter_map = _vertex_index;
_vertex_range = make_pair(numeric_limits<double>::min(), numeric_limits<double>::max());
_vertex_range_include = make_pair(false, false);
_vertex_range = make_pair(0.0, numeric_limits<double>::max());
_vertex_range_include = make_pair(true, true);
_vertex_range_invert = false;
}
#else
......@@ -169,8 +169,8 @@ void GraphInterface::SetEdgeFilterProperty(string property)
else
{
_edge_filter_map = _edge_index;
_edge_range = make_pair(numeric_limits<double>::min(), numeric_limits<double>::max());
_edge_range_include = make_pair(false, false);
_edge_range = make_pair(0.0, numeric_limits<double>::max());
_edge_range_include = make_pair(true, true);
_edge_range_invert = false;
}
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment