AENC/switchchain Changeset - aa79d2994c1e · Centrum Wiskunde & Informatica (CWI)

Changeset - aa79d2994c1e

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Tom Bannink - 8 years ago 2017-07-10 10:19:50
tom.bannink@cwi.nl

Update canonical switchchain

1 file changed with 10 insertions and 6 deletions:

cpp/switchchain_canonical_properties.cpp

0 comments (0 inline, 0 general)

cpp/switchchain_canonical_properties.cpp

➞

Show inline comments

@@ @@ -50,16 +50,16 @@ int main(int argc, char* argv[]) { @@
     //const int totalDegreeSamples = 5000;
     auto getMixingTime = [](int n, float tau) {
-        return int(50.0f * (50.0f - 10.0f * (tau - 2.0f)) * n);
+        return int(50.0f * (50.0f - 5.0f * (tau - 2.0f)) * n);
     };
     auto getMeasurements = [](int n, float tau) {
         (void)n;
         (void)tau;
-        return 10;
+        return 100;
     };
     auto getMeasureSkip = [](int n, float tau) {
         (void)tau;
         return n; // Take a sample every ... steps
+        return 10 * n; // Take a sample every ... steps
     };
     // Output file
@@ @@ -79,7 +79,9 @@ int main(int argc, char* argv[]) { @@
             << " step " << numVerticesStep << std::endl;
     outfile << "tauValues: " << tauValues << std::endl;
     outfile << "Canonical degree sequence.\n";
     outfile << "mixingTime: 50 * (50 - 10 (tau - 2)) n\n";
     outfile << "mixingTime: 50 * (50 - 5 (tau - 2)) n\n";
     outfile << "measurements: 100\n";
     outfile << "measureSkip: 10 n\n";
     outfile << "data:\n";
     outfile << "1: {n,tau}\n";
     outfile << "2: avgTriangles\n";
@@ @@ -143,6 +145,8 @@ int main(int argc, char* argv[]) { @@
             //    getSpectralValues(gs_start.computeLaplacianSpectrum());
             long long trianglesTotal = 0;
             chain.g.getTrackedTriangles() = chain.g.countTriangles();
             int movesDone = 0;
             avgAspectrum.fill(0);
             avgLspectrum.fill(0);
@@ @@ -150,9 +154,9 @@ int main(int argc, char* argv[]) { @@
             int measureSkip = getMeasureSkip(numVertices, tau);
             for (int i = 0; i < measurements; ++i) {
                 for (int j = 0; j < measureSkip; ++j)
                     if (chain.doMove())
+                    if (chain.doMove(true))
                         ++movesDone;
-                trianglesTotal += chain.g.countTriangles();
+                trianglesTotal += chain.g.getTrackedTriangles();
                 //auto sA = getSpectralValues(gs.computeAdjacencySpectrum());
                 //auto sL = getSpectralValues(gs.computeLaplacianSpectrum());
                 //for (auto i = 0u; i < 3; ++i) {

0 comments (0 inline, 0 general)