diff --git a/cpp/switchchain_exponent.cpp b/cpp/switchchain_exponent.cpp index 897b728f1b944058313a63c7003a59f7a043a50d..5510c28bcd1021e4233b79d864c5b07f245f4b88 100644 --- a/cpp/switchchain_exponent.cpp +++ b/cpp/switchchain_exponent.cpp @@ -12,9 +12,9 @@ int main(int argc, char* argv[]) { // Simulation parameters - const int numVerticesMin = 10000; - const int numVerticesMax = 50000; - const int numVerticesStep = 10000; + const int numVerticesMin = 1000; + const int numVerticesMax = 5000; + const int numVerticesStep = 1000; //float tauValues[] = {2.1f, 2.2f, 2.3f, 2.4f, 2.5f, 2.6f, 2.7f, 2.8f, 2.9f}; float tauValues[] = {2.1f, 2.3f, 2.5f, 2.7f, 2.9f}; @@ -39,7 +39,7 @@ int main(int argc, char* argv[]) { if (argc >= 2) outfile.open(argv[1]); else - outfile.open("graphdata_exponent_new.m"); + outfile.open("graphdata_exponent.m"); if (!outfile.is_open()) { std::cout << "ERROR: Could not open output file.\n"; return 1; @@ -94,19 +94,20 @@ int main(int argc, char* argv[]) { std::cout << "Mixing done. " << std::flush; long long trianglesTotal = 0; - chain.g.getTrackedTriangles() = chain.g.countTriangles(); + //chain.g.getTrackedTriangles() = chain.g.countTriangles(); int measurements = getMeasurements(numVertices, tau); int measureSkip = getMeasureSkip(numVertices, tau); for (int i = 0; i < measurements; ++i) { for (int j = 0; j < measureSkip; ++j) - chain.doMove(true); - trianglesTotal += chain.g.getTrackedTriangles(); + chain.doMove(false); + //trianglesTotal += chain.g.getTrackedTriangles(); + trianglesTotal += chain.g.countTriangles(); } float avgTriangles = float(trianglesTotal) / float(measurements); - std::cout << "Measuring done." << std::flush; + std::cout << "Measuring done. " << std::flush; if (outputComma) outfile << ',' << '\n';