From b9486351acf3198b6717fb2635afe8c3a02b733e 2017-06-03 15:49:45
From: Tom Bannink <tom.bannink@cwi.nl>
Date: 2017-06-03 15:49:45
Subject: [PATCH] Modify successrates cpp file for non-timeevol

---

diff --git a/cpp/switchchain_successrates.cpp b/cpp/switchchain_successrates.cpp
index fb5d707ad618d81ee17eeacebfe5761533ad839d..2a31f5235b0c121c59200fe665ca468866306ab2 100644
--- a/cpp/switchchain_successrates.cpp
+++ b/cpp/switchchain_successrates.cpp
@@ -216,7 +216,7 @@ int main(int argc, char* argv[]) {
     if (argc >= 2)
         outfile.open(argv[1]);
     else   
-        outfile.open("graphdata_successrates_timeevol.m");
+        outfile.open("graphdata_successrates.m");
 
     if (!outfile.is_open()) {
         std::cout << "ERROR: Could not open output file.\n";
@@ -236,7 +236,7 @@ int main(int argc, char* argv[]) {
             // For a single n,tau take samples over several instances of
             // the degree distribution.
             // 500 samples seems to give reasonable results
-            for (int degreeSample = 0; degreeSample < 5; ++degreeSample) {
+            for (int degreeSample = 0; degreeSample < 2000; ++degreeSample) {
                 // Generate a graph
                 // might require multiple tries
                 for (int i = 1; ; ++i) {
@@ -315,9 +315,15 @@ int main(int argc, char* argv[]) {
                     outfile << ',' << '\n';
                 outputComma = true;
 
-                std::sort(ds.begin(), ds.end());
+                long long trianglesTotal = 0;
+                for (int i = 0; i < measurements; ++i)
+                    trianglesTotal += triangles[i];
+
+                float avgTriangles =
+                    float(trianglesTotal) / float(measurements);
+
                 outfile << '{' << '{' << numVertices << ',' << tau << '}';
-                outfile << ',' << triangles;
+                outfile << ',' << avgTriangles;
                 outfile << ',' << successRates;
                 outfile << '}' << std::flush;