diff --git a/cpp/switchchain.cpp b/cpp/switchchain.cpp index d46956ceedb2e54c40cc04157f92a297309c1731..442b4b280f94c9bd1a03a978aab5b9eac04f4295 100644 --- a/cpp/switchchain.cpp +++ b/cpp/switchchain.cpp @@ -76,7 +76,7 @@ int main() { // Expect: #tri = const * n^{ something } // The goal is to find the 'something' by finding the number of triangles // for different values of n and tau - float tauValues[] = {2.2f, 2.5f, 2.8f}; + float tauValues[] = {2.2f, 2.35f, 2.5f, 2.65f, 2.8f}; Graph g; @@ -84,16 +84,16 @@ int main() { outfile << '{'; bool outputComma = false; - for (int numVertices = 4000; numVertices <= 8000; numVertices += 1000) { + for (int numVertices = 200; numVertices <= 1000; numVertices += 100) { for (float tau : tauValues) { DegreeSequence ds(numVertices); - powerlaw_distribution degDist(tau, 2, 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 - for (int degreeSample = 0; degreeSample < 200; ++degreeSample) { + for (int degreeSample = 0; degreeSample < 500; ++degreeSample) { // Generate a graph // might require multiple tries for (int i = 1; ; ++i) { @@ -118,10 +118,10 @@ int main() { << numVertices << ", tau = " << tau << ". \t" << std::flush; - constexpr int mixingTime = 20000; - constexpr int measureTime = 10000; + constexpr int mixingTime = 30000; + constexpr int measureTime = 20000; constexpr int measureSkip = - 100; // Take a sample every 100 steps + 200; // Take a sample every ... steps constexpr int measurements = (measureTime - 1) / measureSkip + 1; int movesDone = 0;