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
b7f1f2a9
Commit
b7f1f2a9
authored
Jun 24, 2018
by
Tiago Peixoto
Browse files
Fix problem with gibbs sampling
parent
0eb27fe5
Pipeline
#426
passed with stage
in 509 minutes and 8 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/graph/inference/blockmodel/graph_blockmodel_partition.hh
View file @
b7f1f2a9
...
@@ -117,7 +117,6 @@ public:
...
@@ -117,7 +117,6 @@ public:
}
}
}
}
template
<
bool
resize
=
false
>
size_t
get_r
(
size_t
r
)
size_t
get_r
(
size_t
r
)
{
{
if
(
use_rmap
)
if
(
use_rmap
)
...
@@ -131,7 +130,7 @@ public:
...
@@ -131,7 +130,7 @@ public:
nr
=
_bmap
[
r
]
=
_hist
.
size
();
nr
=
_bmap
[
r
]
=
_hist
.
size
();
r
=
nr
;
r
=
nr
;
}
}
if
(
(
resize
||
use_rmap
)
&&
r
>=
_hist
.
size
())
if
(
r
>=
_hist
.
size
())
{
{
_hist
.
resize
(
r
+
1
);
_hist
.
resize
(
r
+
1
);
_total
.
resize
(
r
+
1
);
_total
.
resize
(
r
+
1
);
...
@@ -274,7 +273,7 @@ public:
...
@@ -274,7 +273,7 @@ public:
r
=
get_r
(
r
);
r
=
get_r
(
r
);
if
(
nr
!=
null_group
)
if
(
nr
!=
null_group
)
nr
=
get_r
<
true
>
(
nr
);
nr
=
get_r
(
nr
);
int
n
=
vweight
[
v
];
int
n
=
vweight
[
v
];
if
(
n
==
0
)
if
(
n
==
0
)
...
@@ -339,7 +338,7 @@ public:
...
@@ -339,7 +338,7 @@ public:
if
(
r
!=
null_group
)
if
(
r
!=
null_group
)
r
=
get_r
(
r
);
r
=
get_r
(
r
);
if
(
nr
!=
null_group
)
if
(
nr
!=
null_group
)
nr
=
get_r
<
true
>
(
nr
);
nr
=
get_r
(
nr
);
double
S_b
=
0
,
S_a
=
0
;
double
S_b
=
0
,
S_a
=
0
;
...
@@ -377,7 +376,7 @@ public:
...
@@ -377,7 +376,7 @@ public:
if
(
r
!=
null_group
)
if
(
r
!=
null_group
)
r
=
get_r
(
r
);
r
=
get_r
(
r
);
if
(
nr
!=
null_group
)
if
(
nr
!=
null_group
)
nr
=
get_r
<
true
>
(
nr
);
nr
=
get_r
(
nr
);
auto
dop
=
auto
dop
=
[
&
](
auto
&&
f
)
[
&
](
auto
&&
f
)
...
@@ -591,7 +590,7 @@ public:
...
@@ -591,7 +590,7 @@ public:
{
{
if
(
nr
==
null_group
||
vweight
[
v
]
==
0
)
if
(
nr
==
null_group
||
vweight
[
v
]
==
0
)
return
;
return
;
nr
=
get_r
<
true
>
(
nr
);
nr
=
get_r
(
nr
);
change_vertex
(
v
,
nr
,
deg_corr
,
g
,
vweight
,
eweight
,
degs
,
1
);
change_vertex
(
v
,
nr
,
deg_corr
,
g
,
vweight
,
eweight
,
degs
,
1
);
}
}
...
...
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