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
df948de9
Commit
df948de9
authored
Oct 28, 2016
by
Tiago Peixoto
Browse files
Replace some make_tuple instance with brace initializers
parent
c688f9a3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/graph/inference/graph_blockmodel.hh
View file @
df948de9
...
...
@@ -650,9 +650,9 @@ public:
gt_hash_map
<
std
::
tuple
<
vertex_t
,
int
>
,
vector
<
edge_t
>>
ns_u
,
ns_v
;
for
(
auto
e
:
out_edges_range
(
u
,
_g
))
ns_u
[
std
::
make_tuple
(
target
(
e
,
_g
),
ec
[
e
]
)
].
push_back
(
e
);
ns_u
[
{
target
(
e
,
_g
),
ec
[
e
]
}
].
push_back
(
e
);
for
(
auto
e
:
out_edges_range
(
v
,
_g
))
ns_v
[
std
::
make_tuple
(
target
(
e
,
_g
),
ec
[
e
]
)
].
push_back
(
e
);
ns_v
[
{
target
(
e
,
_g
),
ec
[
e
]
}
].
push_back
(
e
);
for
(
auto
&
kv
:
ns_u
)
{
...
...
@@ -681,7 +681,7 @@ public:
}
}
auto
iter
=
ns_v
.
find
(
std
::
make_tuple
(
t
,
l
)
);
auto
iter
=
ns_v
.
find
(
{
t
,
l
}
);
if
(
iter
!=
ns_v
.
end
())
{
auto
&
e
=
iter
->
second
.
front
();
...
...
@@ -692,7 +692,7 @@ public:
else
{
auto
e
=
add_edge
(
v
,
t
,
_g
).
first
;
ns_v
[
std
::
make_tuple
(
t
,
l
)
].
push_back
(
e
);
ns_v
[
{
t
,
l
}
].
push_back
(
e
);
eweight_c
[
e
]
=
w
;
rec_c
[
e
]
=
ecc
;
drec_c
[
e
]
=
decc
;
...
...
@@ -706,9 +706,9 @@ public:
ns_v
.
clear
();
for
(
auto
e
:
in_edges_range
(
v
,
_g
))
ns_v
[
std
::
make_tuple
(
source
(
e
,
_g
),
ec
[
e
]
)
].
push_back
(
e
);
ns_v
[
{
source
(
e
,
_g
),
ec
[
e
]
}
].
push_back
(
e
);
for
(
auto
e
:
in_edges_range
(
u
,
_g
))
ns_u
[
std
::
make_tuple
(
source
(
e
,
_g
),
ec
[
e
]
)
].
push_back
(
e
);
ns_u
[
{
source
(
e
,
_g
),
ec
[
e
]
}
].
push_back
(
e
);
for
(
auto
&
kv
:
ns_u
)
{
...
...
@@ -728,7 +728,7 @@ public:
decc
+=
_drec
[
e
];
}
auto
iter
=
ns_v
.
find
(
std
::
make_tuple
(
s
,
l
)
);
auto
iter
=
ns_v
.
find
(
{
s
,
l
}
);
if
(
iter
!=
ns_v
.
end
())
{
auto
&
e
=
iter
->
second
.
front
();
...
...
@@ -739,7 +739,7 @@ public:
else
{
auto
e
=
add_edge
(
s
,
v
,
_g
).
first
;
ns_v
[
std
::
make_tuple
(
s
,
l
)
].
push_back
(
e
);
ns_v
[
{
s
,
l
}
].
push_back
(
e
);
eweight_c
[
e
]
=
w
;
rec_c
[
e
]
=
ecc
;
drec_c
[
e
]
=
decc
;
...
...
@@ -778,9 +778,9 @@ public:
{
gt_hash_map
<
std
::
tuple
<
size_t
,
size_t
>
,
size_t
>
hist
;
for
(
auto
&
kn
:
degs
[
u
])
hist
[
make_tuple
(
get
<
0
>
(
kn
),
get
<
1
>
(
kn
)
)
]
+=
get
<
2
>
(
kn
);
hist
[
{
get
<
0
>
(
kn
),
get
<
1
>
(
kn
)
}
]
+=
get
<
2
>
(
kn
);
for
(
auto
&
kn
:
degs
[
v
])
hist
[
make_tuple
(
get
<
0
>
(
kn
),
get
<
1
>
(
kn
)
)
]
+=
get
<
2
>
(
kn
);
hist
[
{
get
<
0
>
(
kn
),
get
<
1
>
(
kn
)
}
]
+=
get
<
2
>
(
kn
);
degs
[
u
].
clear
();
degs
[
v
].
clear
();
auto
&
d
=
degs
[
v
];
...
...
@@ -1695,7 +1695,7 @@ public:
size_t
s
=
_b
[
target
(
e
,
_g
)];
if
(
!
is_directed
::
apply
<
g_t
>::
type
::
value
&&
s
<
r
)
std
::
swap
(
r
,
s
);
mrs
[
std
::
make_pair
(
r
,
s
)
]
+=
_eweight
[
e
];
mrs
[
{
r
,
s
}
]
+=
_eweight
[
e
];
}
for
(
auto
&
rs_m
:
mrs
)
...
...
Tiago Peixoto
@count0
Mentioned in commit
7d66170b
·
Nov 03, 2016
Mentioned in commit
7d66170b
Mentioned in commit 7d66170b74bb93dc888e109a10189f5d0e154aa0
Toggle commit list
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