AENC/switchchain Changeset - 1df09cbbb7ed · Centrum Wiskunde & Informatica (CWI)

Changeset - 1df09cbbb7ed

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Tom Bannink - 8 years ago 2017-06-02 21:18:51
tom.bannink@cwi.nl

Fix DSP computation

1 file changed with 1 insertions and 1 deletions:

cpp/switchchain_dsp.cpp

0 comments (0 inline, 0 general)

cpp/switchchain_dsp.cpp

➞

Show inline comments

@@ @@ -68,25 +68,25 @@ double getProperty(const DegreeSequence& ds) { @@
     for (auto& v : vals) {
         v.resize(ds.size(), 0);
+    }
     auto D = 0u;
     for (auto d : ds)
         D += d;
     double factor = 1.0 / double(D);
     for (auto i = 0u; i < ds.size(); ++i) {
         for (auto j = i + 1; j < ds.size(); ++j) {
             vals[i][j] = 1.0 - std::exp(-ds[i] * ds[j] * factor);
+            vals[i][j] = 1.0 - std::exp(-(ds[i] * ds[j] * factor));
+        }
+    }
     double result = 0.0;
     for (auto i = 0u; i < ds.size(); ++i) {
         for (auto j = i + 1; j < ds.size(); ++j) {
             for (auto k = j + 1; k < ds.size(); ++k) {
                 result += vals[i][j] * vals[j][k] * vals[i][k];
+            }
+        }
+    }
     return result;

0 comments (0 inline, 0 general)