Changeset ec544e for src/graph

Timestamp:

04/14/11 15:30:13 (2 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

5cbf85

Parents:

b311b0

git-author:

Tiago de Paula Peixoto <tiago@…> (04/14/11 14:56:39)

git-committer:

Tiago de Paula Peixoto <tiago@…> (04/14/11 15:30:13)

Message:

Fix bug in histogram with bin list of size 2

This also changes the semantics of of bin list of size 2, and also
simplifies the histogram code slightly.

Location:

src/graph

Files:

• histogram.hh (modified) (2 diffs)
• stats/graph_histograms.cc (modified) (1 diff)
• stats/graph_histograms.hh (modified) (3 diffs)

src/graph/histogram.hh

@@ -59 +59 @@
         for (size_t j = 0; j < Dim; ++j)
         {
-            if (_bins[j].size() < 2)
-                throw std::range_error("invalid bin edge number < 2!");
+            if (_bins[j].size() < 1)
+                throw std::range_error("invalid bin edge number < 1!");
 
             _data_range[j] = std::make_pair(0, 0);
-
-            // detect whether the given bins are of constant width, for faster
-            // binning
-            _const_width[j] = true;
             value_type delta = _bins[j][1] - _bins[j][0];
-            for (size_t i = 2; i < _bins[j].size(); ++i)
-            {
-                value_type d = _bins[j][i] - _bins[j][i-1];
-                if (delta != d)
-                    _const_width[j] = false;
-            }
-
-            if (_const_width[j])
-            {
-                if (_bins[j].size() > 2)
-                {
+
+            if (_bins[j].size() == 2)
+            {
+                _data_range[j] = std::make_pair(_bins[j][0], _bins[j][0]);
+                delta = _bins[j][1];
+                _const_width[j] = true;
+            }
+            else
+            {
+                // detect whether the given bins are of constant width, for faster
+                // binning
+                _const_width[j] = true;
+                for (size_t i = 2; i < _bins[j].size(); ++i)
+                {
+                    value_type d = _bins[j][i] - _bins[j][i-1];
+                    if (delta != d)
+                        _const_width[j] = false;
+                }
+
+                if (_const_width[j])
                     _data_range[j] = std::make_pair(_bins[j].front(),
                                                     _bins[j].back());
-                    new_shape[j] = _bins[j].size() - 1;
-                }
-                else
-                {
-                    _data_range[j] = std::make_pair(_bins[j].front(),
-                                                    _bins[j].front());
-                    new_shape[j] = 1;
-                }
-                if (delta == 0)
-                    throw std::range_error("invalid bin size of zero!");
-            }
-            else
-            {
-                new_shape[j] = _bins[j].size() - 1;
-            }
+            }
+            if (delta == 0)
+                throw std::range_error("invalid bin size of zero!");
+
+            new_shape[j] = _bins[j].size() - 1;
         }
         _counts.resize(new_shape);
@@ -107 +102 @@
             if (_const_width[i])
             {
-                if (_data_range[i].first != _data_range[i].second &&
-                    (v[i] < _data_range[i].first ||
-                     v[i] > _data_range[i].second))
-                    return; // out of bounds
-                value_type delta = _bins[i][1] - _bins[i][0];
+                value_type delta;
+
+                if (_data_range[i].first == _data_range[i].second)
+                {
+                    delta = _bins[i][1];
+
+                    if (v[i] < _data_range[i].first)
+                        return; // out of bounds
+                }
+                else
+                {
+                    delta = _bins[i][1] - _bins[i][0];
+
+                    if (v[i] < _data_range[i].first ||
+                        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

src/graph/stats/graph_histograms.cc

@@ -36 +36 @@
     run_action<>()(gi, get_histogram<VertexHistogramFiller>(hist, bins,
                                                             ret_bins),
-                   scalar_selectors())(degree_selector(deg));
+         scalar_selectors())(degree_selector(deg));
     return python::make_tuple(hist, ret_bins);
 }

src/graph/stats/graph_histograms.hh

@@ -36 +36 @@
 public:
     template <class Graph, class DegreeSelector, class Hist>
-    void operator()(Graph& g, typename graph_traits<Graph>::vertex_descriptor v,
+    void operator()(const Graph& g,
+                    typename graph_traits<Graph>::vertex_descriptor v,
                     DegreeSelector& deg, Hist& hist)
     {
@@ -49 +50 @@
 public:
     template <class Graph, class EdgeProperty, class Hist>
-    void operator()(Graph& g, typename graph_traits<Graph>::vertex_descriptor v,
+    void operator()(const Graph& g,
+                    typename graph_traits<Graph>::vertex_descriptor v,
                     EdgeProperty& eprop, Hist& hist)
     {
@@ -72 +74 @@
 
     template <class Graph, class DegreeSelector>
-    void operator()(Graph& g, DegreeSelector deg) const
+    void operator()(const Graph& g, DegreeSelector deg) const
     {
         typedef typename DegreeSelector::value_type value_type;