Commit 66d1db43 authored by Tiago Peixoto's avatar Tiago Peixoto

Merge branch 'header-cleanup' into 'master'

Improve build times through header removal and relocation

See merge request count0/graph-tool!31
parents bc1ada4b 3438f227
......@@ -21,10 +21,6 @@
#include <boost/graph/breadth_first_search.hpp>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <boost/python/object.hpp>
#include <boost/python/list.hpp>
#include <boost/python/extract.hpp>
#include "histogram.hh"
#include "hash_map_wrap.hh"
......
......@@ -25,8 +25,6 @@
#include "graph_avg_correlations.hh"
#include <iostream>
using namespace std;
using namespace boost;
using namespace graph_tool;
......
......@@ -21,12 +21,8 @@
#include <algorithm>
#include <boost/numeric/conversion/bounds.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/python/object.hpp>
#include <boost/python/list.hpp>
#include <boost/python/extract.hpp>
#include "histogram.hh"
#include "numpy_bind.hh"
#include "shared_map.hh"
namespace graph_tool
{
......
......@@ -22,7 +22,6 @@
#include "graph_filtering.hh"
#include <boost/python.hpp>
#include <boost/utility/enable_if.hpp>
#include "graph_selectors.hh"
#include "graph_properties.hh"
......
......@@ -22,7 +22,6 @@
#include "graph_selectors.hh"
#include "graph_properties.hh"
#include <boost/mpl/quote.hpp>
#include <boost/graph/breadth_first_search.hpp>
#include <cmath>
......
......@@ -21,7 +21,6 @@
#include "graph.hh"
#include "graph_filtering.hh"
#include "graph_util.hh"
#include "graph_python_interface.hh"
#ifdef _OPENMP
#include <omp.h>
#endif
......
......@@ -21,7 +21,6 @@
#include "graph_selectors.hh"
#include "graph_properties.hh"
#include <boost/bind/placeholders.hpp>
#include <boost/mpl/push_back.hpp>
#include <boost/python.hpp>
......
......@@ -21,7 +21,6 @@
#include "graph_selectors.hh"
#include "graph_properties.hh"
#include <boost/bind/placeholders.hpp>
#include <boost/mpl/push_back.hpp>
#include <boost/python.hpp>
......
......@@ -21,7 +21,6 @@
#include "graph_selectors.hh"
#include "graph_properties.hh"
#include <boost/bind/placeholders.hpp>
#include <boost/mpl/push_back.hpp>
#include <boost/python.hpp>
......
......@@ -21,7 +21,6 @@
#include "graph_selectors.hh"
#include "graph_properties.hh"
#include <boost/bind/placeholders.hpp>
#include <boost/mpl/push_back.hpp>
#include <boost/python.hpp>
......
......@@ -21,7 +21,6 @@
#include "graph_selectors.hh"
#include "graph_properties.hh"
#include <boost/bind/placeholders.hpp>
#include <boost/mpl/push_back.hpp>
#include <boost/python.hpp>
......
......@@ -20,8 +20,6 @@
#include <tuple>
#include <iostream>
#include <boost/functional/hash.hpp>
#include <boost/multi_array.hpp>
#include "graph.hh"
#include "graph_filtering.hh"
......
......@@ -21,8 +21,6 @@
#include "graph_union.hh"
#include <boost/python/extract.hpp>
using namespace graph_tool;
using namespace boost;
......
......@@ -20,9 +20,6 @@
#include "graph_union.hh"
#include <boost/python/extract.hpp>
using namespace graph_tool;
using namespace boost;
......
......@@ -29,7 +29,6 @@
#include <boost/variant/get.hpp>
#include <boost/spirit/include/support_istream_iterator.hpp>
#include <boost/foreach.hpp>
#include <boost/type_traits.hpp>
#include <boost/algorithm/string/replace.hpp>
......@@ -44,7 +43,6 @@
#include <fstream>
#include <string>
#include <vector>
#include <unordered_map>
#include "base64.hh"
......
......@@ -21,7 +21,6 @@
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <iostream>
using namespace std;
using namespace boost;
......
......@@ -19,11 +19,11 @@
#define GRAPH_HH
#include "config.h"
#include <Python.h>
#include <boost/python/object.hpp>
#include <boost/python/dict.hpp>
#include <boost/python/list.hpp>
#include <boost/python/tuple.hpp>
#include <deque>
#include <boost/any.hpp>
#include "graph_adjacency.hh"
......@@ -31,7 +31,7 @@
#include "fast_vector_property_map.hh"
#include <boost/variant.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/bool_fwd.hpp>
#include "graph_properties.hh"
#include "graph_exceptions.hh"
......
......@@ -22,7 +22,6 @@
#include <deque>
#include <utility>
#include <numeric>
#include <iostream>
#include <tuple>
#include <boost/iterator.hpp>
#include <boost/graph/graph_traits.hpp>
......
......@@ -21,7 +21,6 @@
#include "graph_selectors.hh"
#include <boost/mpl/for_each.hpp>
#include <boost/mpl/contains.hpp>
#include <boost/python/extract.hpp>
using namespace std;
......
......@@ -22,31 +22,14 @@
#include <boost/version.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/erase.hpp>
#include <boost/mpl/clear.hpp>
#include <boost/mpl/map.hpp>
#include <boost/mpl/for_each.hpp>
#include <boost/mpl/at.hpp>
#include <boost/mpl/or.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/logical.hpp>
#include <boost/mpl/inserter.hpp>
#include <boost/mpl/insert_range.hpp>
#include <boost/mpl/back_inserter.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/plus.hpp>
#include <boost/mpl/divides.hpp>
#include <boost/mpl/arithmetic.hpp>
#include <boost/mpl/greater_equal.hpp>
#include <boost/mpl/comparison.hpp>
#include <boost/mpl/transform_view.hpp>
#include <boost/mpl/quote.hpp>
#include <boost/mpl/range_c.hpp>
#include <boost/mpl/print.hpp>
#include "graph_adaptor.hh"
#include "graph_filtered.hh"
#include "graph_reverse.hh"
#include "graph_selectors.hh"
#include "graph_util.hh"
#include "mpl_nested_loop.hh"
......
......@@ -22,8 +22,7 @@
#include <boost/iostreams/filtering_stream.hpp>
#include <boost/iostreams/filter/gzip.hpp>
#include <boost/iostreams/filter/bzip2.hpp>
#include <boost/iostreams/device/file_descriptor.hpp>
#include <boost/iostreams/device/file.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/graph/graphml.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/xpressive/xpressive.hpp>
......
......@@ -26,24 +26,22 @@
#include <boost/functional/hash.hpp>
#include <boost/python/object.hpp>
#include <boost/python/extract.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/version.hpp>
#if (BOOST_VERSION >= 104000)
# include <boost/property_map/property_map.hpp>
# include <boost/property_map/dynamic_property_map.hpp>
#else
# include <boost/property_map.hpp>
# include <boost/dynamic_property_map.hpp>
#endif
#include "fast_vector_property_map.hh"
#include <boost/mpl/vector.hpp>
#include <boost/mpl/for_each.hpp>
#include <boost/mpl/transform.hpp>
#include <boost/mpl/find.hpp>
#include <boost/mpl/bind.hpp>
#include "graph.hh"
#include "graph_exceptions.hh"
#include "hash_map_wrap.hh"
// this file provides general functions for manipulating graph properties
......
......@@ -19,9 +19,6 @@
#include "graph_filtering.hh"
#include "graph_properties.hh"
#include <boost/mpl/contains.hpp>
#include <boost/python/extract.hpp>
#include "graph_properties_copy.hh"
using namespace std;
......
......@@ -22,9 +22,7 @@
#include "graph_filtering.hh"
#include "graph_properties.hh"
#include "graph_util.hh"
#include <boost/mpl/contains.hpp>
#include <boost/python/extract.hpp>
#include "hash_map_wrap.hh"
namespace graph_tool
{
......
......@@ -22,8 +22,6 @@
#include "graph_properties_group.hh"
#include <boost/python/extract.hpp>
using namespace std;
using namespace boost;
using namespace graph_tool;
......
......@@ -23,8 +23,6 @@
#include "graph_util.hh"
#include "hash_map_wrap.hh"
#include <boost/mpl/for_each.hpp>
#include <boost/python/extract.hpp>
using namespace std;
......
......@@ -23,10 +23,6 @@
#include "graph_util.hh"
#include "hash_map_wrap.hh"
#include <boost/mpl/for_each.hpp>
#include <boost/python/extract.hpp>
using namespace std;
using namespace boost;
using namespace graph_tool;
......
......@@ -22,8 +22,6 @@
#include "graph_properties_group.hh"
#include <boost/python/extract.hpp>
using namespace std;
using namespace boost;
using namespace graph_tool;
......
......@@ -21,8 +21,6 @@
#include "graph_python_interface.hh"
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
#include <set>
#include "coroutine.hh"
......
......@@ -19,7 +19,6 @@
#define PYTHON_INTERFACE_HH
#include <boost/python.hpp>
#include <boost/python/type_id.hpp>
namespace std
{
......@@ -37,6 +36,12 @@ namespace std
#include <boost/mpl/logical.hpp>
#include <boost/iterator/iterator_facade.hpp>
#include <boost/version.hpp>
#if (BOOST_VERSION >= 104000)
# include <boost/property_map/dynamic_property_map.hpp>
#else
# include <boost/dynamic_property_map.hpp>
#endif
#include <type_traits>
#include "graph.hh"
......
......@@ -21,7 +21,6 @@
#include "demangle.hh"
#include <boost/python.hpp>
#include <boost/lambda/bind.hpp>
using namespace std;
using namespace boost;
......
......@@ -19,6 +19,7 @@
#include "graph.hh"
#include "graph_util.hh"
#include "graph_python_interface.hh"
#include "hash_map_wrap.hh"
#include <boost/python.hpp>
#include <boost/python/stl_iterator.hpp>
......
......@@ -26,9 +26,8 @@
#include <boost/graph/adjacency_iterator.hpp>
#include <boost/graph/properties.hpp>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/type_traits.hpp>
#include <boost/mpl/if.hpp>
#include <utility>
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
// Stay out of the way of the concept checking class
......
......@@ -24,11 +24,12 @@
#include <boost/mpl/map.hpp>
#include <boost/mpl/at.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/find.hpp>
#include <boost/mpl/not.hpp>
#include <boost/mpl/logical.hpp>
#include <boost/mpl/transform.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/back_inserter.hpp>
#include <boost/any.hpp>
#include <boost/graph/graph_traits.hpp>
#include "graph_adaptor.hh"
#include "graph_properties.hh"
#include "graph.hh"
......
......@@ -30,13 +30,9 @@ namespace boost { namespace python { namespace detail {
} } }
#include <boost/graph/graph_traits.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/type_traits/is_convertible.hpp>
#include <string>
#include <boost/functional/hash.hpp>
......@@ -44,7 +40,6 @@ namespace boost { namespace python { namespace detail {
#include <random>
#include "graph_selectors.hh"
#include "graph_reverse.hh"
#include "graph_filtered.hh"
namespace graph_tool
......
......@@ -10,13 +10,11 @@
// Tiago de Paula Peixoto
#include <boost/python.hpp>
#include <boost/variant.hpp>
#include <expat.h>
#include <boost/graph/graphml.hpp>
#include <boost/algorithm/string/replace.hpp>
#include <boost/archive/iterators/xml_escape.hpp>
#include <boost/archive/iterators/ostream_iterator.hpp>
#include <boost/archive/iterators/insert_linebreaks.hpp>
#include <sstream>
#include "base64.hh"
......
......@@ -25,7 +25,6 @@
#define BOOST_DISABLE_ASSERTS
#include <boost/multi_array.hpp>
#include <boost/type_traits.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/int.hpp>
......
......@@ -21,6 +21,8 @@
#include "../support/util.hh"
#include "../support/int_part.hh"
#include "hash_map_wrap.hh"
namespace graph_tool
{
......
......@@ -17,7 +17,6 @@
#include "graph_latent_multigraph.hh"
#include <boost/mpl/push_back.hpp>
#include <boost/python.hpp>
using namespace std;
......
......@@ -23,8 +23,6 @@
#include <vector>
#include <cmath>
#include <boost/math/special_functions/gamma.hpp>
namespace graph_tool
{
using namespace std;
......
......@@ -15,9 +15,6 @@
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <boost/math/special_functions/zeta.hpp>
#include <boost/math/special_functions/gamma.hpp>
#include "graph_tool.hh"
#include "hash_map_wrap.hh"
#include "int_part.hh"
......
......@@ -25,7 +25,6 @@
#include "graph_tool.hh"
#include "../support/graph_state.hh"
#include "graph_blockmodel_dynamics.hh"
#include "graph_python_interface.hh"
namespace graph_tool
{
......
......@@ -19,8 +19,6 @@
#include "graph.hh"
#include "graph_properties.hh"
#include <boost/lambda/bind.hpp>
#include "graph_arf.hh"
using namespace std;
......
......@@ -31,10 +31,6 @@ Value power(Value value, int n)
}
#endif
#include <boost/math/special_functions/gamma.hpp>
#include <boost/math/special_functions/hypot.hpp>
#include <boost/math/constants/constants.hpp>
#include <boost/graph/fruchterman_reingold.hpp>
using namespace std;
......
......@@ -20,8 +20,6 @@
#include "graph_properties.hh"
#include "graph_exceptions.hh"
#include <boost/lambda/bind.hpp>
#include "graph_sfdp.hh"
#include "random.hh"
#include "hash_map_wrap.hh"
......
......@@ -33,7 +33,6 @@
#define BOOST_DISABLE_ASSERTS
#include <boost/multi_array.hpp>
#include <boost/type_traits.hpp>
#include <boost/mpl/int.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/map.hpp>
......
......@@ -25,8 +25,6 @@
// Ronald Garcia
//
#include <boost/ref.hpp>
#include <boost/function/function2.hpp>
#include <boost/version.hpp>
#if (BOOST_VERSION >= 104000)
# include <boost/property_map/dynamic_property_map.hpp>
......@@ -47,8 +45,6 @@
#include <cstdlib>
#include <boost/throw_exception.hpp>
#include <boost/regex.hpp>
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <boost/graph/graphviz.hpp>
namespace boost {
......
......@@ -28,7 +28,6 @@
#include "graph_astar.hh"
#include "coroutine.hh"
#include "graph_python_interface.hh"
using namespace std;
using namespace boost;
......
......@@ -16,7 +16,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "graph_filtering.hh"
#include "graph_python_interface.hh"
#include <boost/python.hpp>
#include <boost/graph/astar_search.hpp>
......
......@@ -26,7 +26,6 @@
#include "graph_util.hh"
#include "coroutine.hh"
#include "graph_python_interface.hh"
using namespace std;
using namespace boost;
......
......@@ -10,14 +10,12 @@
#include <boost/python.hpp>
#include <boost/graph/depth_first_search.hpp>
#include <boost/graph/undirected_dfs.hpp>
#include "graph.hh"
#include "graph_selectors.hh"
#include "graph_util.hh"
#include "coroutine.hh"
#include "graph_python_interface.hh"
using namespace std;
using namespace boost;
......
......@@ -26,7 +26,6 @@
#include "graph_util.hh"
#include "coroutine.hh"
#include "graph_python_interface.hh"
using namespace std;
using namespace boost;
......
......@@ -19,8 +19,6 @@
#define GRAPH_AVERAGE_HH
#include <algorithm>
#include <boost/numeric/conversion/bounds.hpp>
#include <boost/numeric/conversion/cast.hpp>
namespace graph_tool
{
......
......@@ -23,7 +23,6 @@
#include <boost/python/object.hpp>
#include <boost/python/list.hpp>
#include <boost/python/extract.hpp>
#include "histogram.hh"
#include "numpy_bind.hh"
......
......@@ -23,7 +23,6 @@
#include <boost/python/object.hpp>
#include <boost/python/list.hpp>
#include <boost/python/extract.hpp>
#include "histogram.hh"
#include "numpy_bind.hh"
......
......@@ -22,8 +22,6 @@
#include <boost/numeric/conversion/bounds.hpp>
#include <boost/numeric/conversion/cast.hpp>
#include <boost/python/object.hpp>
#include <boost/python/list.hpp>
#include <boost/python/extract.hpp>
#include "numpy_bind.hh"
#include "histogram.hh"
#include "shared_map.hh"
......
......@@ -22,8 +22,6 @@
#include "graph_util.hh"
#include "idx_map.hh"