Merge branch 'includes' into 'master'

Remove unused includes

See merge request !43

src/graph/generation/graph_generation.hh

@@ -18,8 +18,6 @@
 #ifndef GRAPH_GENERATION_HH
 #define GRAPH_GENERATION_HH
 
-#include <tuple>
-#include <boost/functional/hash.hpp>
 #include <map>
 #include <set>
 #include <iostream>

src/graph/generation/graph_knn.hh

@@ -19,7 +19,6 @@
 #define GRAPH_KNN_HH
 
 #include <tuple>
-#include <iostream>
 #include <random>
 #include <boost/functional/hash.hpp>
 

src/graph/generation/graph_lattice.hh

@@ -18,7 +18,6 @@
 #ifndef GRAPH_LATTICE_HH
 #define GRAPH_LATTICE_HH
 
-#include <iostream>
 #include "graph_util.hh"
 
 namespace graph_tool

src/graph/generation/graph_maxent_sbm.hh

@@ -19,7 +19,6 @@
 #define GRAPH_MAXENT_SBM_HH
 
 #include <tuple>
-#include <iostream>
 
 #include "graph.hh"
 #include "graph_filtering.hh"

src/graph/generation/graph_rewiring.hh

@@ -20,7 +20,6 @@
 
 #include <tuple>
 #include <iostream>
-#include <boost/functional/hash.hpp>
 
 #include "graph.hh"
 #include "graph_filtering.hh"

src/graph/generation/graph_sbm.hh

@@ -18,10 +18,6 @@
 #ifndef GRAPH_SBM_HH
 #define GRAPH_SBM_HH
 
-#include <tuple>
-#include <iostream>
-#include <boost/functional/hash.hpp>
-
 #include "graph.hh"
 #include "graph_filtering.hh"
 #include "graph_util.hh"

src/graph/generation/graph_triangulation.hh

@@ -23,8 +23,6 @@
 #ifndef GRAPH_TRIANGULATION_HH
 #define GRAPH_TRIANGULATION_HH
 
-#include <tuple>
-
 #include "graph_util.hh"
 #include "hash_map_wrap.hh"
 

src/graph/gml.hh

@@ -22,29 +22,18 @@
 
 #include <boost/config/warning_disable.hpp>
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-#include <boost/spirit/include/phoenix_fusion.hpp>
-#include <boost/spirit/include/phoenix_stl.hpp>
-#include <boost/fusion/include/adapt_struct.hpp>
 #include <boost/variant/recursive_variant.hpp>
 #include <boost/variant/get.hpp>
 #include <boost/spirit/include/support_istream_iterator.hpp>
-#include <boost/foreach.hpp>
-
-#include <boost/regex/pending/unicode_iterator.hpp>
 
 #include <boost/algorithm/string/replace.hpp>
 
 #include <boost/property_map/dynamic_property_map.hpp>
-#include <boost/tuple/tuple.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/graph/properties.hpp>
 
 #include <boost/python.hpp>
 
 #include <iostream>
-#include <fstream>
 #include <string>
 #include <vector>
 #include <unordered_map>

src/graph/graph_adaptor.hh

@@ -18,12 +18,9 @@
 #ifndef GRAPH_ADAPTOR_HH
 #define GRAPH_ADAPTOR_HH
 
-#include <list>
-
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
 #include <boost/graph/graph_traits.hpp>
-#include <boost/graph/properties.hpp>
 
 #include "transform_iterator.hh"
 

src/graph/graph_adjacency.hh

@@ -21,14 +21,11 @@
 #include <vector>
 #include <deque>
 #include <utility>
-#include <numeric>
-#include <tuple>
 #include <boost/iterator.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/range/irange.hpp>
 #include <boost/property_map/property_map.hpp>
 #include <boost/graph/properties.hpp>
-#include <boost/iterator/transform_iterator.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 
 #ifdef __clang__

src/graph/graph_filtered.hh

@@ -30,7 +30,6 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
 #include <boost/graph/adjacency_iterator.hpp>
-#include <boost/graph/detail/set_adaptor.hpp>
 #include <boost/iterator/filter_iterator.hpp>
 #include <boost/graph/filtered_graph.hpp> // for predicate classes
 

src/graph/graph_properties.hh

@@ -18,11 +18,8 @@
 #ifndef GRAPH_PROPERTIES_HH
 #define GRAPH_PROPERTIES_HH
 
-#include <typeinfo>
 #include <string>
 #include <vector>
-#include <memory>
-#include <random>
 #include <unordered_map>
 #include <boost/functional/hash.hpp>
 #include <boost/python/object.hpp>

src/graph/graph_properties_copy_imp1.cc

@@ -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;

src/graph/graph_python_interface.hh

@@ -33,8 +33,6 @@ namespace std
 }
 
 #include <boost/graph/graph_traits.hpp>
-#include <boost/mpl/logical.hpp>
-#include <boost/iterator/iterator_facade.hpp>
 
 #include <boost/version.hpp>
 #if (BOOST_VERSION >= 104000)
@@ -42,7 +40,6 @@ namespace std
 #else
 #   include <boost/dynamic_property_map.hpp>
 #endif
-#include <type_traits>
 
 #include "graph.hh"
 #include "graph_filtering.hh"

src/graph/graph_python_interface_imp1.cc

@@ -23,7 +23,6 @@
 
 #include <boost/python.hpp>
 #include <boost/python/stl_iterator.hpp>
-#include <set>
 
 
 using namespace std;

src/graph/graph_reverse.hh

@@ -24,9 +24,6 @@
 # define GRAPH_REVERSE
 
 #include <boost/graph/adjacency_iterator.hpp>
-#include <boost/graph/properties.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <boost/mpl/if.hpp>
 #include <utility>
 
 #if BOOST_WORKAROUND(BOOST_MSVC, < 1300)

src/graph/graphml.cpp

@@ -9,7 +9,6 @@
 //           Andrew Lumsdaine
 //           Tiago de Paula Peixoto
 
-#include <boost/python.hpp>
 #include <expat.h>
 #include <boost/graph/graphml.hpp>
 #include <boost/algorithm/string/replace.hpp>

src/graph/histogram.hh

@@ -28,8 +28,6 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/int.hpp>
 
-#include <boost/python/object.hpp>
-
 //
 // This is a generic multidimensional histogram type
 //

src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh

@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <algorithm>
-#include <queue>
 
 #include "graph_tool.hh"
 #include "../support/graph_state.hh"

src/graph/inference/blockmodel/graph_blockmodel_partition.hh

@@ -23,6 +23,8 @@
 
 #include "hash_map_wrap.hh"
 
+#include <boost/range/counting_range.hpp>
+
 namespace graph_tool
 {
 

src/graph/inference/graph_latent_multigraph.hh

@@ -18,10 +18,7 @@
 #ifndef GRAPH_LATENT_MULTIGRAPH_HH
 #define GRAPH_LATENT_MULTIGRAPH_HH
 
-#include <tuple>
 #include <iostream>
-#include <fstream>
-#include <iomanip>
 
 #include "graph_tool.hh"
 #include "hash_map_wrap.hh"

src/graph/inference/graph_modularity.hh

@@ -18,11 +18,6 @@
 #ifndef GRAPH_MODULARITY_HH
 #define GRAPH_MODULARITY_HH
 
-#include <tuple>
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-
 #include "graph_tool.hh"
 #include "hash_map_wrap.hh"
 

src/graph/inference/layers/graph_blockmodel_layers_util.hh

@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <vector>
-
 namespace graph_tool
 {
 using namespace boost;

src/graph/inference/loops/bundled_vacate_loop.hh

@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <iostream>
 #include <queue>
 
 #include <tuple>

src/graph/inference/loops/gibbs_loop.hh

@@ -20,9 +20,6 @@
 
 #include "config.h"
 
-#include <iostream>
-#include <queue>
-
 #include <tuple>
 
 #include "hash_map_wrap.hh"

src/graph/inference/loops/mcmc_loop.hh

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <iostream>
-#include <queue>
 
 #include <tuple>
 

src/graph/inference/support/graph_state.hh

@@ -22,18 +22,13 @@
 #include <boost/preprocessor/comparison/equal.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/seq/size.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/for_each_i.hpp>
 #include <boost/preprocessor/stringize.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
-#include <boost/preprocessor/control/if.hpp>
 #include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/seq/transform.hpp>
 #include <boost/preprocessor/seq/filter.hpp>
 #include <boost/preprocessor/comparison/equal.hpp>
-#include <boost/preprocessor/comparison/not_equal.hpp>
-#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/preprocessor/seq/first_n.hpp>
 
 #include "graph.hh"

src/graph/inference/support/int_part.hh

@@ -10,8 +10,6 @@
 
 #include "config.h"
 
-#include <cmath>
-#include <iostream>
 #include <boost/multi_array.hpp>
 
 #include "cache.hh"

src/graph/inference/support/util.hh

@@ -21,12 +21,9 @@
 #include "config.h"
 
 #include <cmath>
-#include <iostream>
 
 #include "cache.hh"
 
-#include <boost/range/counting_range.hpp>
-
 namespace graph_tool
 {
 using namespace boost;

src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh

@@ -19,7 +19,6 @@
 #define GRAPH_SBM_SAMPLE_EDGE_HH
 
 #include <tuple>
-#include <iostream>
 
 #include "graph.hh"
 #include "graph_filtering.hh"

src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh

@@ -20,8 +20,6 @@
 
 #include "config.h"
 
-#include <vector>
-
 #include "../support/graph_state.hh"
 #include "../blockmodel/graph_blockmodel_util.hh"
 #include "graph_blockmodel_sample_edge.hh"

src/graph/layout/graph_arf.hh

@@ -18,9 +18,6 @@
 #ifndef GRAPH_ARF_HH
 #define GRAPH_ARF_HH
 
-#include <limits>
-#include <iostream>
-
 namespace graph_tool
 {
 using namespace std;

src/graph/mpl_nested_loop.hh

@@ -18,11 +18,6 @@
 #ifndef NESTED_FOR_LOOP_HH
 #define NESTED_FOR_LOOP_HH
 
-#include <boost/mpl/for_each.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/empty.hpp>
-#include <boost/any.hpp>
-
 namespace boost
 {
 namespace mpl

src/graph/numpy_bind.hh

@@ -34,10 +34,8 @@
 #include <boost/multi_array.hpp>
 
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/vector.hpp>
 #include <boost/mpl/map.hpp>
 #include <boost/mpl/pair.hpp>
-#include <boost/mpl/for_each.hpp>
 
 #include "demangle.hh"
 

src/graph/random.cc

@@ -19,6 +19,8 @@
 #include "random.hh"
 #include "parallel_rng.hh"
 
+#include <random>
+
 rng_t get_rng(size_t seed)
 {
     parallel_rng<rng_t>::clear();

src/graph/random.hh

@@ -18,7 +18,6 @@
 #ifndef RANDOM_HH
 #define RANDOM_HH
 
-#include <random>
 #include "pcg_random.hpp"
 
 //typedef std::mt19937_64 rng_t;

src/graph/read_graphviz_new.cpp

@@ -31,18 +31,12 @@
 #else
 #   include <boost/dynamic_property_map.hpp>
 #endif
-#include <boost/graph/graph_traits.hpp>
-#include <boost/detail/workaround.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
-#include <algorithm>
-#include <exception> // for std::exception
 #include <string>
 #include <vector>
 #include <set>
 #include <utility>
 #include <map>
-#include <iostream>
-#include <cstdlib>
 #include <boost/throw_exception.hpp>
 #include <boost/regex.hpp>
 #include <boost/graph/graphviz.hpp>

src/graph/stats/graph_parallel.cc

@@ -23,8 +23,6 @@
 
 #include <boost/python.hpp>
 
-#include <iostream>
-
 using namespace std;
 using namespace boost;
 using namespace graph_tool;

src/graph/str_repr.hh

@@ -18,7 +18,6 @@
 #ifndef STR_REPR_HH
 #define STR_REPR_HH
 
-#include <iostream>
 #include <clocale>
 #include <sstream>
 #include <boost/lexical_cast.hpp>

src/graph/topology/graph_bipartite_weighted_matching.hh

@@ -20,7 +20,6 @@
 
 #include <stack>
 #include <boost/graph/breadth_first_search.hpp>
-#include <boost/graph/max_cardinality_matching.hpp>
 #include "idx_map.hh"
 
 namespace graph_tool

src/graph/topology/graph_matching.cc

@@ -19,7 +19,6 @@
 #include "graph.hh"
 #include "graph_properties.hh"
 
-#include <boost/graph/max_cardinality_matching.hpp>
 #include <boost/graph/maximum_weighted_matching.hpp>
 
 #include "graph_bipartite_weighted_matching.hh"

src/graph/topology/graph_transitive_closure.cc

@@ -15,7 +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/python.hpp>
 #include <boost/graph/transitive_closure.hpp>
 
 #include "graph.hh"