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

Changeset - b9486351acf3

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Tom Bannink - 8 years ago 2017-06-03 15:49:45
tom.bannink@cwi.nl

Modify successrates cpp file for non-timeevol

1 file changed with 10 insertions and 4 deletions:

cpp/switchchain_successrates.cpp

0 comments (0 inline, 0 general)

cpp/switchchain_successrates.cpp

➞

Show inline comments

@@ @@ -207,45 +207,45 @@ int main(int argc, char* argv[]) { @@
     //float tauValues[] = {2.5f};
     float tauValues[] = {2.1f, 2.2f, 2.3f, 2.4f, 2.5f, 2.6f, 2.7f, 2.8f, 2.9f};
     Graph g;
     Graph g1;
     Graph g2;
     std::ofstream outfile;
     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";
         return 1;
+    }
     outfile << '{';
     bool outputComma = false;
     for (int numVertices = 1000; numVertices <= 1000; numVertices += 1000) {
         for (float tau : tauValues) {
             DegreeSequence ds(numVertices);
             powerlaw_distribution degDist(tau, 1, numVertices);
             //std::poisson_distribution<> degDist(12);
             // 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) {
                     std::generate(ds.begin(), ds.end(),
                                   [&degDist, &rng] { return degDist(rng); });
                     // First make the sum even
                     unsigned int sum = std::accumulate(ds.begin(), ds.end(), 0);
                     if (sum % 2) {
                         continue;
                         // Can we do this: ??
                         ds.back()++;
+                    }
@@ @@ -306,25 +306,31 @@ int main(int argc, char* argv[]) { @@
                     successrate = 0;
+                }
                 std::cout << '('
                           << 100.0f * float(movesSuccess) / float(movesTotal)
                           << "% successrate). " << std::flush;
                 // std::cout << std::endl;
                 if (outputComma)
                     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;
                 std::cout << std::endl;
+            }
+        }
+    }
     outfile << '}';
     return 0;
+}

0 comments (0 inline, 0 general)