Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
graph-tool
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
40
Issues
40
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tiago Peixoto
graph-tool
Commits
807fc3ae
Commit
807fc3ae
authored
May 06, 2012
by
Tiago Peixoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some compilation issues with GCC 4.7
parent
03d646d3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
8 deletions
+6
-8
src/graph/community/graph_community.hh
src/graph/community/graph_community.hh
+1
-1
src/graph/fast_vector_property_map.hh
src/graph/fast_vector_property_map.hh
+0
-3
src/graph/histogram.hh
src/graph/histogram.hh
+4
-3
src/graph/stats/graph_distance_sampled.hh
src/graph/stats/graph_distance_sampled.hh
+1
-1
No files found.
src/graph/community/graph_community.hh
View file @
807fc3ae
...
...
@@ -438,7 +438,7 @@ public:
double
operator
()(
size_t
k
,
size_t
s
)
const
{
const
typeof
(
_NNks
[
k
])
&
nnks
=
_NNks
.
find
(
k
)
->
second
;
const
unordered_map
<
size_t
,
double
>
&
nnks
=
_NNks
.
find
(
k
)
->
second
;
const
typeof
(
nnks
.
begin
())
iter
=
nnks
.
find
(
s
);
if
(
iter
!=
nnks
.
end
())
return
iter
->
second
;
...
...
src/graph/fast_vector_property_map.hh
View file @
807fc3ae
...
...
@@ -74,9 +74,6 @@ public:
const
IndexMap
&
index
=
IndexMap
())
:
store
(
new
std
::
vector
<
T
>
(
initial_size
)),
index
(
index
)
{}
checked_vector_property_map
(
const
unchecked_t
&
map
)
:
checked_vector_property_map
(
map
.
get_checked
())
{}
typename
std
::
vector
<
T
>::
iterator
storage_begin
()
{
return
store
->
begin
();
...
...
src/graph/histogram.hh
View file @
807fc3ae
...
...
@@ -20,6 +20,7 @@
#include <vector>
#include <utility>
#include <algorithm>
#include <boost/array.hpp>
#define BOOST_DISABLE_ASSERTS
#include <boost/multi_array.hpp>
...
...
@@ -118,7 +119,7 @@ public:
v
[
i
]
>=
_data_range
[
i
].
second
)
return
;
// out of bounds
}
bin
[
i
]
=
(
v
[
i
]
-
_data_range
[
i
].
first
)
/
delta
;
if
(
bin
[
i
]
>=
_counts
.
shape
()[
i
])
// modify shape
{
...
...
@@ -194,8 +195,8 @@ public:
typename
Histogram
::
bin_t
shape
;
for
(
size_t
i
=
0
;
i
<
this
->
_counts
.
num_dimensions
();
++
i
)
shape
[
i
]
=
max
(
this
->
_counts
.
shape
()[
i
],
_sum
->
GetArray
().
shape
()[
i
]);
shape
[
i
]
=
std
::
max
(
this
->
_counts
.
shape
()[
i
],
_sum
->
GetArray
().
shape
()[
i
]);
_sum
->
GetArray
().
resize
(
shape
);
for
(
size_t
i
=
0
;
i
<
this
->
_counts
.
num_elements
();
++
i
)
{
...
...
src/graph/stats/graph_distance_sampled.hh
View file @
807fc3ae
...
...
@@ -98,9 +98,9 @@ struct get_sampled_distance_histogram
for
(
i
=
0
;
i
<
int
(
n_samples
);
++
i
)
{
vertex_t
v
;
tr1
::
uniform_int
<
size_t
>
randint
(
0
,
sources
.
size
()
-
1
);
{
#pragma omp critical
tr1
::
uniform_int
<
size_t
>
randint
(
0
,
sources
.
size
()
-
1
);
size_t
i
=
randint
(
rng
);
v
=
sources
[
i
];
swap
(
sources
[
i
],
sources
.
back
());
...
...
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