Commit f063fbed authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

* src/graph/Makefile.am: added 'boost_workaround' files

* src/Makefile.am: removed 'boost_workaround' dist files

* src/graph/graph_rewiring.cc: deleted blank lines.


git-svn-id: https://svn.forked.de/graph-tool/trunk@116 d4600afd-f417-0410-95de-beed9576f240
parent e5d146c6
2007-07-29 Tiago de Paula Peixoto <tiago@forked.de>
* src/graph/Makefile.am: added 'boost_workaround' files
* src/Makefile.am: removed 'boost_workaround' dist files
* src/graph/graph_rewiring.cc: deleted blank lines.
2007-07-27 Tiago de Paula Peixoto <tiago@forked.de> 2007-07-27 Tiago de Paula Peixoto <tiago@forked.de>
* src/graph/graph_extended_clustering.cc (GraphInterface::SetExtendedClusteringToProperty): init vector_property_map size, so that access becomes thread safe. * src/graph/graph_extended_clustering.cc (GraphInterface::SetExtendedClusteringToProperty): init vector_property_map size, so that access becomes thread safe.
......
...@@ -6,11 +6,4 @@ SUBDIRS = graph . ...@@ -6,11 +6,4 @@ SUBDIRS = graph .
bin_SCRIPTS = graph-tool bin_SCRIPTS = graph-tool
boost_workarounddir = boost-workaround EXTRA_DIST = $(bin_SCRIPTS)
boost_workaround_DATA = \ \ No newline at end of file
boost-workaround/boost/graph/filtered_graph.hpp \
boost-workaround/boost/graph/fruchterman_reingold.hpp \
boost-workaround/boost/graph/graphml.hpp
EXTRA_DIST = $(bin_SCRIPTS) $(boost_workaround_DATA)
\ No newline at end of file
...@@ -47,7 +47,10 @@ libgraph_tool_la_SOURCES = \ ...@@ -47,7 +47,10 @@ libgraph_tool_la_SOURCES = \
graphml.cpp\ graphml.cpp\
histogram.hh\ histogram.hh\
shared_map.hh\ shared_map.hh\
read_graphviz_spirit.cpp read_graphviz_spirit.cpp\
../boost-workaround/boost/graph/filtered_graph.hpp\
../boost-workaround/boost/graph/fruchterman_reingold.hpp\
../boost-workaround/boost/graph/graphml.hpp
libgraph_tool_la_LIBADD = \ libgraph_tool_la_LIBADD = \
$(PYTHON_LDFLAGS) \ $(PYTHON_LDFLAGS) \
......
...@@ -79,8 +79,6 @@ struct get_in_edges ...@@ -79,8 +79,6 @@ struct get_in_edges
} }
}; };
template <class Graph> template <class Graph>
bool is_adjacent(typename graph_traits<Graph>::vertex_descriptor u, typename graph_traits<Graph>::vertex_descriptor v, Graph& g ) bool is_adjacent(typename graph_traits<Graph>::vertex_descriptor u, typename graph_traits<Graph>::vertex_descriptor v, Graph& g )
{ {
...@@ -227,7 +225,6 @@ struct graph_rewire ...@@ -227,7 +225,6 @@ struct graph_rewire
} }
}; };
template <class Graph> template <class Graph>
class RandomRewireStrategy class RandomRewireStrategy
{ {
...@@ -268,7 +265,6 @@ public: ...@@ -268,7 +265,6 @@ public:
{ {
v = vertex_sample(_rng); v = vertex_sample(_rng);
} }
vertex = _vertices.upper_bound(v)->second; vertex = _vertices.upper_bound(v)->second;
} }
while ( (!self_loops && (vertex == source(e, _g)) ) || while ( (!self_loops && (vertex == source(e, _g)) ) ||
...@@ -382,7 +378,7 @@ private: ...@@ -382,7 +378,7 @@ private:
//============================================================================== //==============================================================================
// RandomRewire // RandomRewire
//============================================================================== //==============================================================================
void GraphInterface::RandomRewire(rewire_strat_t strat, bool self_loops, bool parallel_edges, size_t seed) void GraphInterface::RandomRewire(rewire_strat_t strat, bool self_loops, bool parallel_edges, size_t seed)
{ {
bool reversed = GetReversed(); bool reversed = GetReversed();
SetReversed(false); SetReversed(false);
......
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