Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tiago Peixoto
graph-tool
Commits
709320ad
Commit
709320ad
authored
Nov 01, 2016
by
Tiago Peixoto
Browse files
Fix compilation with Boost 1.62
This fixes issue
#347
parent
1ac66242
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/boost-workaround/boost/graph/filtered_graph.hpp
View file @
709320ad
...
...
@@ -391,7 +391,16 @@ namespace boost {
}
template
<
typename
G
,
typename
EP
,
typename
VP
>
inline
__attribute__
((
always_inline
))
inline
typename
filtered_graph
<
G
,
EP
,
VP
>::
degree_size_type
degree
(
typename
filtered_graph
<
G
,
EP
,
VP
>::
vertex_descriptor
u
,
const
filtered_graph
<
G
,
EP
,
VP
>&
g
)
{
return
in_degree
(
u
,
g
)
+
out_degree
(
u
,
g
);
}
template
<
typename
G
,
typename
EP
,
typename
VP
>
inline
__attribute__
((
always_inline
))
__attribute__
((
flatten
))
std
::
pair
<
typename
filtered_graph
<
G
,
EP
,
VP
>::
adjacency_iterator
,
typename
filtered_graph
<
G
,
EP
,
VP
>::
adjacency_iterator
>
out_neighbours
(
typename
filtered_graph
<
G
,
EP
,
VP
>::
vertex_descriptor
u
,
...
...
src/graph/inference/graph_blockmodel_marginals.cc
View file @
709320ad
...
...
@@ -21,6 +21,8 @@
#include "numpy_bind.hh"
#include "hash_map_wrap.hh"
#include <boost/math/special_functions/gamma.hpp>
using
namespace
std
;
using
namespace
boost
;
using
namespace
graph_tool
;
...
...
@@ -266,9 +268,9 @@ double log_n_permutations(const vector<int32_t>& b)
std
::
vector
<
int32_t
>
count
(
b
.
size
());
for
(
auto
bi
:
b
)
count
[
bi
]
++
;
double
n
=
boost
::
lgamma
(
b
.
size
()
+
1
);
double
n
=
boost
::
math
::
lgamma
(
b
.
size
()
+
1
);
for
(
auto
nr
:
count
)
n
-=
boost
::
lgamma
(
nr
+
1
);
n
-=
boost
::
math
::
lgamma
(
nr
+
1
);
return
n
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment