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

1 file changed:

cpp/switchchain_ccm_initialtris.cpp

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

cpp/switchchain_ccm_initialtris.cpp

➞

Show inline comments

@@ @@ -12,9 +12,9 @@ @@
 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};
@@ @@ -84,8 +84,8 @@ int main(int argc, char* argv[]) { @@
                 //
                 // 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) {
@@ @@ -93,14 +93,16 @@ int main(int argc, char* argv[]) { @@
                     // 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)) {

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)