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

Changeset - ae292ff3308e

Parent rev.

Child rev.

[Not reviewed]

4 1 0

Tom Bannink - 8 years ago 2017-08-14 16:08:03
tom.bannink@cwi.nl

Remove invalidated CCM datasets

5 files changed with 9 insertions and 19555 deletions:

cpp/switchchain_ccm_initialtris.cpp

data/graphdata_ccm_timeevol_canonical.m

data/graphdata_initialtris.m

4123

data/graphdata_initialtris2.m

6405

data/graphdata_initialtris3.m

9000

0 comments (0 inline, 0 general)

cpp/switchchain_ccm_initialtris.cpp

➞

Show inline comments

@@ @@ -3,27 +3,27 @@ @@
 #include "graph_ccm.hpp"
 #include "graph_powerlaw.hpp"
 #include "switchchain.hpp"
 #include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <numeric>
 #include <random>
 #include <vector>
 int main(int argc, char* argv[]) {
     // Simulation parameters
     const int numVerticesMin = 200;
     const int numVerticesMax = 2000;
     const int numVerticesStep = 400;
     const int numVerticesMin = 1000;
     const int numVerticesMax = 1000;
     const int numVerticesStep = 500;
     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};
     const int totalDegreeSamples = 200;
     auto getMixingTime = [](int n, float tau) {
         return int(50.0f * (50.0f - 30.0f * (tau - 2.0f)) * n);
     };
     auto getMeasurements = [](int n, float tau) {
         (void)n;
         (void)tau;
@@ @@ -75,41 +75,43 @@ int main(int argc, char* argv[]) { @@
             // the degree distribution.
             for (int degreeSample = 0; degreeSample < totalDegreeSamples;
                  ++degreeSample) {
                 DegreeSequence ds;
                 generatePowerlawGraph(numVertices, tau, g, ds, rng);
                 std::cout << "Running (n,tau) = (" << numVertices << ',' << tau
                           << "). " << std::flush;
                 //
                 // Test the GCM1 and GCM2 success rate
                 //
                 long long gcmTris1 = 0;
                 long long gcmTris2 = 0;
                 long long gcmTris1tot = 0;
                 long long gcmTris2tot = 0;
                 int successrate1 = 0;
                 int successrate2 = 0;
                 for (int i = 0; i < 100; ++i) {
                     Graph gtemp;
                     // Take new highest degree every time
                     if (constrainedConfigurationModel(ds, gtemp, rng, false)) {
                         ++successrate1;
-                        gcmTris1 += gtemp.countTriangles();
+                        gcmTris1tot += gtemp.countTriangles();
+                    }
                     // Finish all pairings of highest degree first
                     if (constrainedConfigurationModel(ds, gtemp, rng, true)) {
                         ++successrate2;
-                        gcmTris2 += gtemp.countTriangles();
+                        gcmTris2tot += gtemp.countTriangles();
+                    }
+                }
                 float gcmTris1 = float(gcmTris1tot) / float(successrate1);
                 float gcmTris2 = float(gcmTris2tot) / float(successrate2);
                 SwitchChain chain;
                 if (!chain.initialize(g)) {
                     std::cerr << "Could not initialize Markov chain.\n";
                     return 1;
+                }
                 long long trianglesTotal = 0;
                 std::cout << " Finished CCM generation." << std::flush;

data/graphdata_ccm_timeevol_canonical.m

➞

Show inline comments

deleted file

data/graphdata_initialtris.m

➞

Show inline comments

deleted file

data/graphdata_initialtris2.m

➞

Show inline comments

deleted file

data/graphdata_initialtris3.m

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)