diff --git a/cpp/switchchain_ecm_initialtris.cpp b/cpp/switchchain_ecm_initialtris.cpp index df1baff263237534835e3d8a02229a226e660c16..3664a0b49ec12a493c504e5019961c624eedc6b0 100644 --- a/cpp/switchchain_ecm_initialtris.cpp +++ b/cpp/switchchain_ecm_initialtris.cpp @@ -12,12 +12,14 @@ int main(int argc, char *argv[]) { // Simulation parameters - const int numVerticesMin = 1000; + const int numVerticesMin = 10000; + //const int numVerticesMin = 1000; const int numVerticesMax = 10000; const int numVerticesStep = 1000; - float tauValues[] = {2.05f, 2.1f, 2.2f, 2.3f, 2.4f, 2.5f, - 2.6f, 2.7f, 2.8f, 2.9f, 2.95f}; + //float tauValues[] = {2.05f, 2.1f, 2.2f, 2.3f, 2.4f, 2.5f, + // 2.6f, 2.7f, 2.8f, 2.9f, 2.95f}; + float tauValues[] = {2.5f}; auto getMixingTime = [](int n, float tau) { return int(50.0f * (50.0f - 5.0f * (tau - 2.0f)) * n); @@ -25,7 +27,7 @@ int main(int argc, char *argv[]) { auto getMeasurements = [](int n, float tau) { (void)n; (void)tau; - return 5000; + return 20000; }; auto getMeasureSkip = [](int n, float tau) { (void)tau; @@ -50,7 +52,7 @@ int main(int argc, char *argv[]) { outfile << "tauValues: " << tauValues << std::endl; outfile << "Canonical degree sequence.\n"; outfile << "mixingTime: 50 * (50 - 5 (tau - 2)) n\n"; - outfile << "measurements: 5000\n"; + outfile << "measurements: 20000\n"; outfile << "measureSkip: 30 n\n"; outfile << "data:\n"; outfile << "1: {n,tau}\n"; @@ -90,6 +92,9 @@ int main(int argc, char *argv[]) { if (erasedConfigurationModel(ds, gtemp, rng)) { ECMtris.push_back(gtemp.countTriangles()); } + if ((i+1) % 1000 == 0) { + std::cout << '.' << std::flush; + } } std::cout << " Finished ECM samples." << std::flush; @@ -111,6 +116,9 @@ int main(int argc, char *argv[]) { for (int j = 0; j < measureSkip; ++j) chain.doMove(true); uniformTris.push_back(chain.g.getTrackedTriangles()); + if ((i+1) % 1000 == 0) { + std::cout << '.' << std::flush; + } } std::cout << " Finished uniform samples." << std::flush;