Commit 563c3dde authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Fix compilation warnings and errors on some compilers

parent d0bd7f48
...@@ -55,7 +55,6 @@ struct get_closeness ...@@ -55,7 +55,6 @@ struct get_closeness
const const
{ {
using namespace boost; using namespace boost;
typedef typename graph_traits<Graph>::vertex_descriptor vertex_t;
// select get_vertex_dists based on the existence of weights // select get_vertex_dists based on the existence of weights
typedef typename mpl::if_<std::is_same<WeightMap, no_weightS>, typedef typename mpl::if_<std::is_same<WeightMap, no_weightS>,
......
...@@ -42,8 +42,6 @@ auto bundled_vacate_sweep(MergeState& state, RNG& rng) ...@@ -42,8 +42,6 @@ auto bundled_vacate_sweep(MergeState& state, RNG& rng)
std::tuple<size_t, double> best_move(state._null_move, std::tuple<size_t, double> best_move(state._null_move,
numeric_limits<double>::max()); numeric_limits<double>::max());
auto r = state.bundle_state(bundle);
auto find_candidates = [&](bool random) auto find_candidates = [&](bool random)
{ {
for (size_t iter = 0; iter < state._niter; ++iter) for (size_t iter = 0; iter < state._niter; ++iter)
......
...@@ -112,7 +112,7 @@ auto gibbs_sweep(GibbsState state, RNG& rng_) ...@@ -112,7 +112,7 @@ auto gibbs_sweep(GibbsState state, RNG& rng_)
idx[j] = j; idx[j] = j;
} }
if (!isinf(beta)) if (!std::isinf(beta))
{ {
for (size_t j = 0; j < moves.size(); ++j) for (size_t j = 0; j < moves.size(); ++j)
{ {
......
...@@ -62,7 +62,6 @@ auto multicanonical_sweep(MulticanonicalState& state, RNG& rng) ...@@ -62,7 +62,6 @@ auto multicanonical_sweep(MulticanonicalState& state, RNG& rng)
{ {
auto v = vertex(uniform_sample(vlist, rng), g); auto v = vertex(uniform_sample(vlist, rng), g);
auto r = state.node_state(v);
auto s = state.move_proposal(v, rng); auto s = state.move_proposal(v, rng);
std::pair<double, double> dS = state.virtual_move_dS(v, s); std::pair<double, double> dS = state.virtual_move_dS(v, s);
......
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