diff --git a/cpp/switchchain_successrates.cpp b/cpp/switchchain_successrates.cpp index 2a31f5235b0c121c59200fe665ca468866306ab2..4f8df72a039202ab01001d3dd58bd88d50dee767 100644 --- a/cpp/switchchain_successrates.cpp +++ b/cpp/switchchain_successrates.cpp @@ -269,13 +269,16 @@ int main(int argc, char* argv[]) { std::cout << "Running n = " << numVertices << ", tau = " << tau << ". \t" << std::flush; - //int mixingTime = (32.0f - 26.0f*(tau - 2.0f)) * numVertices; //40000; - //constexpr int measurements = 50; - //constexpr int measureSkip = - // 200; // Take a sample every ... steps - int mixingTime = 0; - constexpr int measurements = 500; - constexpr int measureSkip = 100; + // Non time evol + int mixingTime = 32*(32.0f - 15.0f*(tau - 2.0f)) * numVertices; //40000; + constexpr int measurements = 50; + constexpr int measureSkip = + 200; // Take a sample every ... steps + + // Time Evol + //int mixingTime = 0; + //constexpr int measurements = 500; + //constexpr int measureSkip = 100; int movesTotal = 0; @@ -290,20 +293,21 @@ int main(int argc, char* argv[]) { } } - std::vector successRates; - successRates.reserve(measurements); - int successrate = 0; + // Time Evol + //std::vector successRates; + //successRates.reserve(measurements); + //int successrate = 0; for (int i = 0; i < measurements; ++i) { for (int j = 0; j < measureSkip; ++j) { ++movesTotal; if (chain.doMove()) { ++movesSuccess; - ++successrate; + //++successrate; } } triangles[i] = chain.g.countTriangles(); - successRates.push_back(successrate); - successrate = 0; + //successRates.push_back(successrate); + //successrate = 0; } std::cout << '(' @@ -324,7 +328,8 @@ int main(int argc, char* argv[]) { outfile << '{' << '{' << numVertices << ',' << tau << '}'; outfile << ',' << avgTriangles; - outfile << ',' << successRates; + //outfile << ',' << successRates; + outfile << ',' << float(movesSuccess) / float(movesTotal); outfile << '}' << std::flush; std::cout << std::endl;