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

@@ @@ -29,78 +29,80 @@ double getDSTN(const DegreeSequence& ds) { @@
+    }
     double result = 0.0;
     for (auto i = 0u; i < ds.size(); ++i) {
         for (auto j = i + 1; j < ds.size(); ++j) {
             for (auto k = j + 1; k < ds.size(); ++k) {
                 result += vals[i][j] * vals[j][k] * vals[i][k];
+            }
+        }
+    }
     return result;
+}
 int main(int argc, char* argv[]) {
     // Simulation parameters
     const int numVerticesMin = 1000;
     const int numVerticesMax = 10000;
     const int numVerticesStep = 1000;
     float tauValues[] = {2.1f, 2.2f, 2.3f, 2.4f, 2.5f, 2.6f, 2.7f, 2.8f, 2.9f};
     //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
     std::ofstream outfile;
     if (argc >= 2)
         outfile.open(argv[1]);
     else
         outfile.open("graphdata_canonical_properties.m");
     if (!outfile.is_open()) {
         std::cout << "ERROR: Could not open output file.\n";
         return 1;
+    }
     // Output Mathematica-style comment to indicate file contents
     outfile << "(*\n";
     outfile << "n from " << numVerticesMin << " to " << numVerticesMax
             << " 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";
     outfile << "3: edges\n";
     outfile << "4: dstn\n";
     //outfile << "5: { HH A, HH L, average A, average L }  where for each there is (average of) {lambda1 , lambda1 - lambda2, lambda1/lambda2}\n";
     outfile << "5: empty\n";
     outfile << "6: switching successrate after mixing\n";
     outfile << "7: initial HH triangles\n";
     outfile << "*)" << std::endl;
     // Mathematica does not accept normal scientific notation
     outfile << std::fixed;
     outfile << '{';
     bool outputComma = false;
     Graph g;
     for (int numVertices = numVerticesMin; numVertices <= numVerticesMax;
          numVertices += numVerticesStep) {
         for (float tau : tauValues) {
             DegreeSequence ds;
             generateCanonicalPowerlawGraph(numVertices, tau, g, ds);
             SwitchChain chain;
@@ @@ -122,58 +124,60 @@ int main(int argc, char* argv[]) { @@
             std::array<double, 3> HHAspectrum;
             std::array<double, 3> HHLspectrum;
             std::array<double, 3> avgAspectrum;
             std::array<double, 3> avgLspectrum;
             //auto getSpectralValues =
             //    [](const std::vector<float> &s) -> std::array<double, 3> {
             //    auto l1 = s[s.size() - 1];
             //    auto l2 = s[s.size() - 2];
             //    return {l1, l1 - l2, l1 / l2};
             //};
             GraphSpectrum gs_start(g);
             GraphSpectrum gs(chain.g);
             HHAspectrum.fill(0);
             HHLspectrum.fill(0);
             //HHAspectrum =
             //    getSpectralValues(gs_start.computeAdjacencySpectrum());
             //HHLspectrum =
             //    getSpectralValues(gs_start.computeLaplacianSpectrum());
             long long trianglesTotal = 0;
             chain.g.getTrackedTriangles() = chain.g.countTriangles();
             int movesDone = 0;
             avgAspectrum.fill(0);
             avgLspectrum.fill(0);
             int measurements = getMeasurements(numVertices, tau);
             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) {
                 //    avgAspectrum[i] += sA[i];
                 //    avgLspectrum[i] += sL[i];
                 //}
+            }
             float avgTriangles = float(trianglesTotal) / float(measurements);
             float successrate =
                 float(movesDone) / float(measurements * measureSkip);
             for (auto &f : avgAspectrum)
                 f /= float(measurements);
             for (auto &f : avgLspectrum)
                 f /= float(measurements);
             std::cout << "Measuring done. " << std::flush;
             if (outputComma)
                 outfile << ',' << '\n';
             outputComma = true;
             outfile << '{' << '{' << numVertices << ',' << tau << '}';
             outfile << ',' << avgTriangles;
             outfile << ',' << g.edgeCount();

0 comments (0 inline, 0 general)