Changeset 682d86

Timestamp:

08/10/06 21:16:39 (7 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

0ef141

Parents:

53f38d

git-author:

Tiago de Paula Peixoto <tiago@…> (08/10/06 21:16:39)

git-committer:

Tiago de Paula Peixoto <tiago@…> (08/10/06 21:16:39)

Message:

average neighbour correlation must actually count neighbours twice, if double edges exist


git-svn-id: https://svn.forked.de/graph-tool/trunk@32 d4600afd-f417-0410-95de-beed9576f240

File:

• src/graph/graph_correlations_neighbours.cc (modified) (3 diffs)

src/graph/graph_correlations_neighbours.cc

@@ -49 +49 @@
     {
     tr1::unordered_map<double,size_t> count;
-    tr1::unordered_set<typename graph_traits<Graph>::vertex_descriptor> neighbour_set;
 
     typename graph_traits<Graph>::vertex_iterator v, v_begin, v_end;
@@ -59 +58 @@
         for(e = e_begin; e != e_end; ++e)
         {       
-        if (neighbour_set.find(target(*e,g)) != neighbour_set.end())
-            continue;
-        else
-            neighbour_set.insert(target(*e,g));
         typename AvgDeg::value_type::second_type::first_type deg = _neighbours_degree(target(*e,g),g);
         typename AvgDeg::key_type orig_deg = _origin_degree(*v,g);
@@ -69 +64 @@
         count[orig_deg]++;
         }
-        neighbour_set.clear();
     }