diff --git a/cpp/switchchain_initialtris.cpp b/cpp/switchchain_initialtris.cpp index 57764da1b250a574d63880f55d95294ce3cb3647..b241f78ebf55a849557d146004dfa8091269087e 100644 --- a/cpp/switchchain_initialtris.cpp +++ b/cpp/switchchain_initialtris.cpp @@ -223,6 +223,9 @@ int main() { } } + std::cout << "Running n = " << numVertices << ", tau = " << tau + << "." << std::flush; + // // Test the GCM1 and GCM2 success rate // @@ -250,9 +253,6 @@ int main() { return 1; } - std::cout << "Running n = " << numVertices << ", tau = " << tau - << ". \t" << std::flush; - int mixingTime = (32.0f - 20.0f * (tau - 2.0f)) * numVertices; constexpr int measurements = 20; constexpr int measureSkip = 200; @@ -261,6 +261,8 @@ int main() { long long trianglesTotal = 0; + std::cout << " .. \t" << std::flush; + for (int i = 0; i < mixingTime; ++i) { if (chain.doMove()) ++movesDone; @@ -269,7 +271,7 @@ int main() { for (int j = 0; j < measureSkip; ++j) if (chain.doMove()) ++movesDone; - trianglesTotal = chain.g.countTriangles(); + trianglesTotal += chain.g.countTriangles(); } std::cout << movesDone << '/' << mixingTime + measurements * measureSkip