From 420ba26b4bb3165f93f4385632ae51a1531f87e1 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Mon, 23 Nov 2020 13:11:47 -0700 Subject: [PATCH] Remove unused includes --- src/graph/generation/graph_generation.hh | 2 -- src/graph/generation/graph_knn.hh | 1 - src/graph/generation/graph_lattice.hh | 1 - src/graph/generation/graph_maxent_sbm.hh | 1 - src/graph/generation/graph_rewiring.hh | 1 - src/graph/generation/graph_sbm.hh | 4 ---- src/graph/generation/graph_triangulation.hh | 2 -- src/graph/gml.hh | 11 ----------- src/graph/graph_adaptor.hh | 3 --- src/graph/graph_adjacency.hh | 3 --- src/graph/graph_filtered.hh | 1 - src/graph/graph_properties.hh | 3 --- src/graph/graph_properties_copy_imp1.cc | 3 --- src/graph/graph_python_interface.hh | 3 --- src/graph/graph_python_interface_imp1.cc | 1 - src/graph/graph_reverse.hh | 3 --- src/graph/graphml.cpp | 1 - src/graph/histogram.hh | 2 -- .../blockmodel/graph_blockmodel_multiflip_mcmc.hh | 1 - .../blockmodel/graph_blockmodel_partition.hh | 2 ++ src/graph/inference/graph_latent_multigraph.hh | 3 --- src/graph/inference/graph_modularity.hh | 5 ----- .../inference/layers/graph_blockmodel_layers_util.hh | 2 -- src/graph/inference/loops/bundled_vacate_loop.hh | 1 - src/graph/inference/loops/gibbs_loop.hh | 3 --- src/graph/inference/loops/mcmc_loop.hh | 1 - src/graph/inference/support/graph_state.hh | 5 ----- src/graph/inference/support/int_part.hh | 2 -- src/graph/inference/support/util.hh | 3 --- .../uncertain/graph_blockmodel_sample_edge.hh | 1 - .../uncertain/graph_blockmodel_uncertain_marginal.hh | 2 -- src/graph/layout/graph_arf.hh | 3 --- src/graph/mpl_nested_loop.hh | 5 ----- src/graph/numpy_bind.hh | 2 -- src/graph/random.cc | 2 ++ src/graph/random.hh | 1 - src/graph/read_graphviz_new.cpp | 6 ------ src/graph/stats/graph_parallel.cc | 2 -- src/graph/str_repr.hh | 1 - .../topology/graph_bipartite_weighted_matching.hh | 1 - src/graph/topology/graph_matching.cc | 1 - src/graph/topology/graph_transitive_closure.cc | 1 - 42 files changed, 4 insertions(+), 98 deletions(-) diff --git a/src/graph/generation/graph_generation.hh b/src/graph/generation/graph_generation.hh index b99c8b5f..2eddf4a4 100644 --- a/src/graph/generation/graph_generation.hh +++ b/src/graph/generation/graph_generation.hh @@ -18,8 +18,6 @@ #ifndef GRAPH_GENERATION_HH #define GRAPH_GENERATION_HH -#include -#include #include #include #include diff --git a/src/graph/generation/graph_knn.hh b/src/graph/generation/graph_knn.hh index 097af11c..ea30310f 100644 --- a/src/graph/generation/graph_knn.hh +++ b/src/graph/generation/graph_knn.hh @@ -19,7 +19,6 @@ #define GRAPH_KNN_HH #include -#include #include #include diff --git a/src/graph/generation/graph_lattice.hh b/src/graph/generation/graph_lattice.hh index 50777e41..8d06777f 100644 --- a/src/graph/generation/graph_lattice.hh +++ b/src/graph/generation/graph_lattice.hh @@ -18,7 +18,6 @@ #ifndef GRAPH_LATTICE_HH #define GRAPH_LATTICE_HH -#include #include "graph_util.hh" namespace graph_tool diff --git a/src/graph/generation/graph_maxent_sbm.hh b/src/graph/generation/graph_maxent_sbm.hh index b82d9d65..de56ba41 100644 --- a/src/graph/generation/graph_maxent_sbm.hh +++ b/src/graph/generation/graph_maxent_sbm.hh @@ -19,7 +19,6 @@ #define GRAPH_MAXENT_SBM_HH #include -#include #include "graph.hh" #include "graph_filtering.hh" diff --git a/src/graph/generation/graph_rewiring.hh b/src/graph/generation/graph_rewiring.hh index 49a775ff..24c64a89 100644 --- a/src/graph/generation/graph_rewiring.hh +++ b/src/graph/generation/graph_rewiring.hh @@ -20,7 +20,6 @@ #include #include -#include #include "graph.hh" #include "graph_filtering.hh" diff --git a/src/graph/generation/graph_sbm.hh b/src/graph/generation/graph_sbm.hh index 4de6ce58..8562fd4e 100644 --- a/src/graph/generation/graph_sbm.hh +++ b/src/graph/generation/graph_sbm.hh @@ -18,10 +18,6 @@ #ifndef GRAPH_SBM_HH #define GRAPH_SBM_HH -#include -#include -#include - #include "graph.hh" #include "graph_filtering.hh" #include "graph_util.hh" diff --git a/src/graph/generation/graph_triangulation.hh b/src/graph/generation/graph_triangulation.hh index 14ede93f..5998d149 100644 --- a/src/graph/generation/graph_triangulation.hh +++ b/src/graph/generation/graph_triangulation.hh @@ -23,8 +23,6 @@ #ifndef GRAPH_TRIANGULATION_HH #define GRAPH_TRIANGULATION_HH -#include - #include "graph_util.hh" #include "hash_map_wrap.hh" diff --git a/src/graph/gml.hh b/src/graph/gml.hh index 2aba0631..94e547d4 100644 --- a/src/graph/gml.hh +++ b/src/graph/gml.hh @@ -22,29 +22,18 @@ #include #include -#include -#include -#include -#include -#include #include #include #include -#include - -#include #include #include -#include #include -#include #include #include -#include #include #include #include diff --git a/src/graph/graph_adaptor.hh b/src/graph/graph_adaptor.hh index 62984b1b..33807a39 100644 --- a/src/graph/graph_adaptor.hh +++ b/src/graph/graph_adaptor.hh @@ -18,12 +18,9 @@ #ifndef GRAPH_ADAPTOR_HH #define GRAPH_ADAPTOR_HH -#include - #include #include #include -#include #include "transform_iterator.hh" diff --git a/src/graph/graph_adjacency.hh b/src/graph/graph_adjacency.hh index b91836ec..e937380e 100644 --- a/src/graph/graph_adjacency.hh +++ b/src/graph/graph_adjacency.hh @@ -21,14 +21,11 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #ifdef __clang__ diff --git a/src/graph/graph_filtered.hh b/src/graph/graph_filtered.hh index ff3175cf..31eeb667 100644 --- a/src/graph/graph_filtered.hh +++ b/src/graph/graph_filtered.hh @@ -30,7 +30,6 @@ #include #include #include -#include #include #include // for predicate classes diff --git a/src/graph/graph_properties.hh b/src/graph/graph_properties.hh index 728a0313..bf16a3d7 100644 --- a/src/graph/graph_properties.hh +++ b/src/graph/graph_properties.hh @@ -18,11 +18,8 @@ #ifndef GRAPH_PROPERTIES_HH #define GRAPH_PROPERTIES_HH -#include #include #include -#include -#include #include #include #include diff --git a/src/graph/graph_properties_copy_imp1.cc b/src/graph/graph_properties_copy_imp1.cc index e2f4c538..c438fd66 100644 --- a/src/graph/graph_properties_copy_imp1.cc +++ b/src/graph/graph_properties_copy_imp1.cc @@ -19,9 +19,6 @@ #include "graph_filtering.hh" #include "graph_properties.hh" -#include -#include - #include "graph_properties_copy.hh" using namespace std; diff --git a/src/graph/graph_python_interface.hh b/src/graph/graph_python_interface.hh index 364832ce..5e1235f5 100644 --- a/src/graph/graph_python_interface.hh +++ b/src/graph/graph_python_interface.hh @@ -33,8 +33,6 @@ namespace std } #include -#include -#include #include #if (BOOST_VERSION >= 104000) @@ -42,7 +40,6 @@ namespace std #else # include #endif -#include #include "graph.hh" #include "graph_filtering.hh" diff --git a/src/graph/graph_python_interface_imp1.cc b/src/graph/graph_python_interface_imp1.cc index b0e05203..eaaf53f7 100644 --- a/src/graph/graph_python_interface_imp1.cc +++ b/src/graph/graph_python_interface_imp1.cc @@ -23,7 +23,6 @@ #include #include -#include using namespace std; diff --git a/src/graph/graph_reverse.hh b/src/graph/graph_reverse.hh index 0a803515..4bd15b8e 100644 --- a/src/graph/graph_reverse.hh +++ b/src/graph/graph_reverse.hh @@ -24,9 +24,6 @@ # define GRAPH_REVERSE #include -#include -#include -#include #include #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) diff --git a/src/graph/graphml.cpp b/src/graph/graphml.cpp index 3c5dedde..8fa89eaf 100644 --- a/src/graph/graphml.cpp +++ b/src/graph/graphml.cpp @@ -9,7 +9,6 @@ // Andrew Lumsdaine // Tiago de Paula Peixoto -#include #include #include #include diff --git a/src/graph/histogram.hh b/src/graph/histogram.hh index e3755946..e5723827 100644 --- a/src/graph/histogram.hh +++ b/src/graph/histogram.hh @@ -28,8 +28,6 @@ #include #include -#include - // // This is a generic multidimensional histogram type // diff --git a/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh b/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh index 46d297d1..1fef761f 100644 --- a/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh +++ b/src/graph/inference/blockmodel/graph_blockmodel_multiflip_mcmc.hh @@ -22,7 +22,6 @@ #include #include -#include #include "graph_tool.hh" #include "../support/graph_state.hh" diff --git a/src/graph/inference/blockmodel/graph_blockmodel_partition.hh b/src/graph/inference/blockmodel/graph_blockmodel_partition.hh index b6165a74..0af1cb29 100644 --- a/src/graph/inference/blockmodel/graph_blockmodel_partition.hh +++ b/src/graph/inference/blockmodel/graph_blockmodel_partition.hh @@ -23,6 +23,8 @@ #include "hash_map_wrap.hh" +#include + namespace graph_tool { diff --git a/src/graph/inference/graph_latent_multigraph.hh b/src/graph/inference/graph_latent_multigraph.hh index eb148477..5efbc792 100644 --- a/src/graph/inference/graph_latent_multigraph.hh +++ b/src/graph/inference/graph_latent_multigraph.hh @@ -18,10 +18,7 @@ #ifndef GRAPH_LATENT_MULTIGRAPH_HH #define GRAPH_LATENT_MULTIGRAPH_HH -#include #include -#include -#include #include "graph_tool.hh" #include "hash_map_wrap.hh" diff --git a/src/graph/inference/graph_modularity.hh b/src/graph/inference/graph_modularity.hh index f0e8c0c9..4562f180 100644 --- a/src/graph/inference/graph_modularity.hh +++ b/src/graph/inference/graph_modularity.hh @@ -18,11 +18,6 @@ #ifndef GRAPH_MODULARITY_HH #define GRAPH_MODULARITY_HH -#include -#include -#include -#include - #include "graph_tool.hh" #include "hash_map_wrap.hh" diff --git a/src/graph/inference/layers/graph_blockmodel_layers_util.hh b/src/graph/inference/layers/graph_blockmodel_layers_util.hh index a3e76a40..7b0761d3 100644 --- a/src/graph/inference/layers/graph_blockmodel_layers_util.hh +++ b/src/graph/inference/layers/graph_blockmodel_layers_util.hh @@ -20,8 +20,6 @@ #include "config.h" -#include - namespace graph_tool { using namespace boost; diff --git a/src/graph/inference/loops/bundled_vacate_loop.hh b/src/graph/inference/loops/bundled_vacate_loop.hh index 2837520e..6d12d7d4 100644 --- a/src/graph/inference/loops/bundled_vacate_loop.hh +++ b/src/graph/inference/loops/bundled_vacate_loop.hh @@ -20,7 +20,6 @@ #include "config.h" -#include #include #include diff --git a/src/graph/inference/loops/gibbs_loop.hh b/src/graph/inference/loops/gibbs_loop.hh index 45793eac..b591de9b 100644 --- a/src/graph/inference/loops/gibbs_loop.hh +++ b/src/graph/inference/loops/gibbs_loop.hh @@ -20,9 +20,6 @@ #include "config.h" -#include -#include - #include #include "hash_map_wrap.hh" diff --git a/src/graph/inference/loops/mcmc_loop.hh b/src/graph/inference/loops/mcmc_loop.hh index a069b36a..0b990284 100644 --- a/src/graph/inference/loops/mcmc_loop.hh +++ b/src/graph/inference/loops/mcmc_loop.hh @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include diff --git a/src/graph/inference/support/graph_state.hh b/src/graph/inference/support/graph_state.hh index c147a3fb..c61327e9 100644 --- a/src/graph/inference/support/graph_state.hh +++ b/src/graph/inference/support/graph_state.hh @@ -22,18 +22,13 @@ #include #include #include -#include #include #include #include -#include #include #include #include #include -#include -#include -#include #include #include "graph.hh" diff --git a/src/graph/inference/support/int_part.hh b/src/graph/inference/support/int_part.hh index dab255e2..c632eddd 100644 --- a/src/graph/inference/support/int_part.hh +++ b/src/graph/inference/support/int_part.hh @@ -10,8 +10,6 @@ #include "config.h" -#include -#include #include #include "cache.hh" diff --git a/src/graph/inference/support/util.hh b/src/graph/inference/support/util.hh index 8d6b15ff..8d0ff2b8 100644 --- a/src/graph/inference/support/util.hh +++ b/src/graph/inference/support/util.hh @@ -21,12 +21,9 @@ #include "config.h" #include -#include #include "cache.hh" -#include - namespace graph_tool { using namespace boost; diff --git a/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh b/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh index f9d00d76..39979c65 100644 --- a/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh +++ b/src/graph/inference/uncertain/graph_blockmodel_sample_edge.hh @@ -19,7 +19,6 @@ #define GRAPH_SBM_SAMPLE_EDGE_HH #include -#include #include "graph.hh" #include "graph_filtering.hh" diff --git a/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh b/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh index cd5ddddf..aeff2fc7 100644 --- a/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh +++ b/src/graph/inference/uncertain/graph_blockmodel_uncertain_marginal.hh @@ -20,8 +20,6 @@ #include "config.h" -#include - #include "../support/graph_state.hh" #include "../blockmodel/graph_blockmodel_util.hh" #include "graph_blockmodel_sample_edge.hh" diff --git a/src/graph/layout/graph_arf.hh b/src/graph/layout/graph_arf.hh index e7a55596..40256f7b 100644 --- a/src/graph/layout/graph_arf.hh +++ b/src/graph/layout/graph_arf.hh @@ -18,9 +18,6 @@ #ifndef GRAPH_ARF_HH #define GRAPH_ARF_HH -#include -#include - namespace graph_tool { using namespace std; diff --git a/src/graph/mpl_nested_loop.hh b/src/graph/mpl_nested_loop.hh index 106cc585..55aaa875 100644 --- a/src/graph/mpl_nested_loop.hh +++ b/src/graph/mpl_nested_loop.hh @@ -18,11 +18,6 @@ #ifndef NESTED_FOR_LOOP_HH #define NESTED_FOR_LOOP_HH -#include -#include -#include -#include - namespace boost { namespace mpl diff --git a/src/graph/numpy_bind.hh b/src/graph/numpy_bind.hh index 29e517c1..a1a249e7 100644 --- a/src/graph/numpy_bind.hh +++ b/src/graph/numpy_bind.hh @@ -34,10 +34,8 @@ #include #include -#include #include #include -#include #include "demangle.hh" diff --git a/src/graph/random.cc b/src/graph/random.cc index b6076a11..f92d7aea 100644 --- a/src/graph/random.cc +++ b/src/graph/random.cc @@ -19,6 +19,8 @@ #include "random.hh" #include "parallel_rng.hh" +#include + rng_t get_rng(size_t seed) { parallel_rng::clear(); diff --git a/src/graph/random.hh b/src/graph/random.hh index c05c408e..aa8deea1 100644 --- a/src/graph/random.hh +++ b/src/graph/random.hh @@ -18,7 +18,6 @@ #ifndef RANDOM_HH #define RANDOM_HH -#include #include "pcg_random.hpp" //typedef std::mt19937_64 rng_t; diff --git a/src/graph/read_graphviz_new.cpp b/src/graph/read_graphviz_new.cpp index b1f67567..630e36f7 100644 --- a/src/graph/read_graphviz_new.cpp +++ b/src/graph/read_graphviz_new.cpp @@ -31,18 +31,12 @@ #else # include #endif -#include -#include #include -#include -#include // for std::exception #include #include #include #include #include -#include -#include #include #include #include diff --git a/src/graph/stats/graph_parallel.cc b/src/graph/stats/graph_parallel.cc index b608ad54..6ae71189 100644 --- a/src/graph/stats/graph_parallel.cc +++ b/src/graph/stats/graph_parallel.cc @@ -23,8 +23,6 @@ #include -#include - using namespace std; using namespace boost; using namespace graph_tool; diff --git a/src/graph/str_repr.hh b/src/graph/str_repr.hh index 65fae6e0..057013e0 100644 --- a/src/graph/str_repr.hh +++ b/src/graph/str_repr.hh @@ -18,7 +18,6 @@ #ifndef STR_REPR_HH #define STR_REPR_HH -#include #include #include #include diff --git a/src/graph/topology/graph_bipartite_weighted_matching.hh b/src/graph/topology/graph_bipartite_weighted_matching.hh index 0fdbc809..5fe31903 100644 --- a/src/graph/topology/graph_bipartite_weighted_matching.hh +++ b/src/graph/topology/graph_bipartite_weighted_matching.hh @@ -20,7 +20,6 @@ #include #include -#include #include "idx_map.hh" namespace graph_tool diff --git a/src/graph/topology/graph_matching.cc b/src/graph/topology/graph_matching.cc index 15797dc1..b46e5bd7 100644 --- a/src/graph/topology/graph_matching.cc +++ b/src/graph/topology/graph_matching.cc @@ -19,7 +19,6 @@ #include "graph.hh" #include "graph_properties.hh" -#include #include #include "graph_bipartite_weighted_matching.hh" diff --git a/src/graph/topology/graph_transitive_closure.cc b/src/graph/topology/graph_transitive_closure.cc index d419f057..38565513 100644 --- a/src/graph/topology/graph_transitive_closure.cc +++ b/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 . -#include #include #include "graph.hh" -- GitLab