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
152ca20b
Commit
152ca20b
authored
May 09, 2016
by
Tiago Peixoto
Browse files
Fix compilation errors with clang
parent
b946f0f4
Pipeline
#180
failed with stage
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/graph/inference/graph_blockmodel_util.hh
View file @
152ca20b
...
...
@@ -126,9 +126,9 @@ auto get_degs(size_t v, Vprop& vweight, Eprop& eweight, const simple_degs_t&,
Graph
&
g
)
{
std
::
array
<
std
::
tuple
<
size_t
,
size_t
,
size_t
>
,
1
>
degs
{{
make_tuple
(
in_degreeS
()(
v
,
g
,
eweight
),
out_degreeS
()(
v
,
g
,
eweight
),
vweight
[
v
])}};
degs
{{
make_tuple
(
size_t
(
in_degreeS
()(
v
,
g
,
eweight
)
)
,
size_t
(
out_degreeS
()(
v
,
g
,
eweight
)
)
,
size_t
(
vweight
[
v
])
)
}};
return
degs
;
}
...
...
src/graph/inference/merge_loop.hh
View file @
152ca20b
...
...
@@ -49,7 +49,7 @@ auto merge_sweep(MergeState state, RNG& rng_)
std
::
vector
<
merge_t
>
best_merge
(
*
std
::
max_element
(
state
.
_available
.
begin
(),
state
.
_available
.
end
())
+
1
,
make_tuple
(
0
,
0
,
make_tuple
(
size_t
(
0
),
size_t
(
0
)
,
numeric_limits
<
double
>::
max
()));
#pragma omp parallel firstprivate(state) if (state._parallel)
...
...
Write
Preview
Supports
Markdown
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