diff --git a/cpp/switchchain_canonical_properties.cpp b/cpp/switchchain_canonical_properties.cpp
index c923ce7fff08f522a2d55c94f3cc0b8b66013e18..91b95eb33f4f6282501da1139e4458a7d6eab311 100644
--- a/cpp/switchchain_canonical_properties.cpp
+++ b/cpp/switchchain_canonical_properties.cpp
@@ -55,11 +55,11 @@ int main(int argc, char* argv[]) {
     auto getMeasurements = [](int n, float tau) {
         (void)n;
         (void)tau;
-        return 100;
+        return 500;
     };
     auto getMeasureSkip = [](int n, float tau) {
         (void)tau;
-        return 10 * n; // Take a sample every ... steps
+        return 20 * n; // Take a sample every ... steps
     };
 
     // Output file
@@ -80,8 +80,8 @@ int main(int argc, char* argv[]) {
     outfile << "tauValues: " << tauValues << std::endl;
     outfile << "Canonical degree sequence.\n";
     outfile << "mixingTime: 50 * (50 - 5 (tau - 2)) n\n";
-    outfile << "measurements: 100\n";
-    outfile << "measureSkip: 10 n\n";
+    outfile << "measurements: 500\n";
+    outfile << "measureSkip: 20 n\n";
     outfile << "data:\n";
     outfile << "1: {n,tau}\n";
     outfile << "2: avgTriangles\n";
diff --git a/data/graphdata_canonical_properties.m b/data/graphdata_canonical_properties.m
deleted file mode 100644
index eb5540fe1e0b3ff69ae46802e5fc40a7d3872b0d..0000000000000000000000000000000000000000
--- a/data/graphdata_canonical_properties.m
+++ /dev/null
@@ -1,104 +0,0 @@
-(*
-n from 1000 to 10000 step 1000
-tauValues: {2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9}
-Canonical degree sequence. OLD INVALID SAMPLER
-mixingTime: 50 * (50 - 30 (tau - 2)) n
-data:
-1: {n,tau}
-2: avgTriangles
-3: edges
-4: dstn
-5: { HH A, HH L, average A, average L }  where for each there is (average of) {lambda1 , lambda1 - lambda2, lambda1/lambda2}
-6: switching successrate after mixing
-7: initial HH triangles
-*)
-{{{1000,2.100000},2912.100098,2536,1684.596094,{{41.121704,22.682817,2.230162},{370.999695,137.998657,1.592266},{29.625049,15.752589,2.136177},{371.009653,137.987054,1.592162}},0.555400,10031},
-{{1000,2.200000},1192.199951,2068,882.098889,{{34.384064,19.302706,2.279905},{264.000244,101.999466,1.629623},{22.751526,10.675033,1.885137},{264.017230,101.977914,1.629341}},0.714900,6363},
-{{1000,2.300000},478.399994,1743,450.557680,{{29.238754,16.430462,2.282799},{186.000092,70.999649,1.617386},{17.748239,7.436039,1.721467},{186.028746,70.971429,1.616835}},0.831400,4208},
-{{1000,2.400000},211.800003,1515,228.348081,{{24.980989,14.401471,2.361260},{135.000504,50.997993,1.607101},{14.380668,5.357008,1.594201},{135.041016,50.969130,1.606257}},0.899700,2929},
-{{1000,2.500000},96.300003,1349,116.228227,{{21.722675,12.425272,2.336424},{99.001854,35.998089,1.571364},{11.747297,3.852805,1.489338},{99.058866,35.971754,1.570192}},0.939900,1984},
-{{1000,2.600000},44.500000,1226,61.826188,{{19.044788,10.901843,2.338808},{76.001884,26.995354,1.550852},{9.899821,2.738063,1.384210},{76.068952,26.946981,1.548574}},0.964600,1217},
-{{1000,2.700000},19.200001,1131,34.946920,{{16.822981,9.600756,2.329335},{60.006367,19.991974,1.499620},{8.501781,2.016140,1.314135},{60.074347,19.974797,1.498132}},0.973900,762},
-{{1000,2.800000},13.300000,1056,20.691035,{{15.119720,8.511143,2.287893},{48.008835,14.995415,1.454222},{7.550066,1.576013,1.269999},{48.085794,14.942022,1.450827}},0.983300,762},
-{{1000,2.900000},6.600000,995,12.996577,{{13.513056,7.433227,2.222605},{40.010620,12.970203,1.479660},{6.752396,1.340488,1.248204},{40.092267,12.973117,1.478382}},0.985700,567},
-{{2000,2.100000},7894.100098,5447,4498.084149,{{58.568634,31.055008,2.128714},{708.000488,265.999542,1.601808},{41.203966,21.406388,2.081560},{708.005780,265.991928,1.601773}},0.563000,28450},
-{{2000,2.200000},2864.699951,4344,2186.614383,{{48.086040,26.050041,2.182158},{479.002777,188.001892,1.646053},{30.422903,13.805776,1.831001},{479.011166,187.985284,1.645940}},0.748900,16973},
-{{2000,2.300000},1105.199951,3608,1028.404506,{{40.058636,22.066736,2.226482},{323.000275,126.999710,1.647956},{23.207724,9.249338,1.663408},{323.019421,126.975270,1.647687}},0.849000,11014},
-{{2000,2.400000},432.899994,3110,480.797260,{{33.949390,18.988787,2.269253},{221.000412,82.999252,1.601439},{18.035536,6.044624,1.505463},{221.029140,82.969861,1.600973}},0.916300,7377},
-{{2000,2.500000},176.399994,2752,224.112600,{{29.195341,16.452457,2.291109},{157.000549,56.998558,1.569974},{14.527700,4.450500,1.442300},{157.043869,56.979205,1.569424}},0.952100,5067},
-{{2000,2.600000},72.300003,2489,108.230078,{{25.145155,14.234315,2.304603},{116.002518,39.996712,1.526232},{11.884723,2.679098,1.293017},{116.048380,39.967759,1.525335}},0.972000,3009},
-{{2000,2.700000},38.799999,2289,55.369715,{{21.965269,12.547328,2.332279},{88.005630,28.993523,1.491315},{10.289264,2.450996,1.313931},{88.066416,28.999784,1.490968}},0.981700,1903},
-{{2000,2.800000},16.600000,2131,30.137451,{{19.476349,10.991457,2.295415},{69.006065,21.988514,1.467666},{8.910216,1.884596,1.271589},{69.073563,21.979945,1.466730}},0.989200,1870},
-{{2000,2.900000},9.400000,2006,18.039160,{{17.540306,9.682266,2.232148},{57.005558,17.986244,1.460958},{7.830239,1.323722,1.204238},{57.054162,17.993493,1.460656}},0.993300,1184},
-{{3000,2.100000},13872.799805,8483,7927.874945,{{71.956551,37.100159,2.064372},{1036.001099,393.000061,1.611197},{49.742691,25.670472,2.066567},{1036.004333,392.993524,1.611177}},0.562000,53239},
-{{3000,2.200000},4692.899902,6683,3690.283045,{{58.459820,30.885794,2.120105},{679.000366,268.999695,1.656096},{35.890340,15.734752,1.780911},{679.008386,268.987848,1.656035}},0.757200,31941},
-{{3000,2.300000},1805.400024,5510,1661.149560,{{48.270866,26.089865,2.176226},{444.000275,175.000092,1.650558},{27.146631,10.463370,1.627495},{444.015295,174.980722,1.650402}},0.861800,19300},
-{{3000,2.400000},663.700012,4721,735.132365,{{40.482285,22.439018,2.243623},{298.000244,113.999649,1.619561},{20.891508,7.184708,1.524275},{298.025345,113.978029,1.619287}},0.926100,12216},
-{{3000,2.500000},247.600006,4166,326.187975,{{34.385777,19.256329,2.272772},{207.000732,75.998428,1.580130},{16.365511,4.345805,1.361702},{207.032561,75.965926,1.579598}},0.961200,7226},
-{{3000,2.600000},103.099998,3760,149.366639,{{29.722357,16.711830,2.284486},{150.000977,52.997757,1.546350},{13.559754,3.400781,1.335619},{150.042896,52.967619,1.545635}},0.976900,4969},
-{{3000,2.700000},48.599998,3453,72.816769,{{25.733906,14.565600,2.304191},{112.003609,36.994370,1.493198},{11.459969,2.478365,1.277719},{112.051579,36.967751,1.492353}},0.986400,3306},
-{{3000,2.800000},23.400000,3212,37.820628,{{22.704988,12.884519,2.312006},{86.004768,26.994625,1.457457},{9.809659,1.679941,1.207254},{86.053734,26.932022,1.455535}},0.990900,2836},
-{{3000,2.900000},14.500000,3020,21.492990,{{20.238235,11.290971,2.261947},{69.004303,20.988708,1.437123},{8.847032,1.694998,1.238470},{69.080426,20.973602,1.435983}},0.993500,2507},
-{{4000,2.100000},20961.699219,11595,11806.839423,{{83.130768,42.136288,2.027853},{1355.000854,516.000305,1.615018},{57.087255,29.159554,2.044149},{1355.004163,515.995215,1.615006}},0.555900,81459},
-{{4000,2.200000},7177.399902,9054,5323.489289,{{66.989578,34.877525,2.086119},{869.000610,346.000183,1.661568},{41.043688,18.172658,1.794645},{869.007306,345.989612,1.661526}},0.753300,46348},
-{{4000,2.300000},2461.800049,7429,2320.202127,{{54.997723,29.413652,2.149686},{556.001221,219.998108,1.654750},{30.328384,11.781192,1.635337},{556.013403,219.985294,1.654663}},0.869700,27972},
-{{4000,2.400000},855.099976,6343,989.397556,{{45.793568,25.256157,2.229764},{367.002380,141.001648,1.623899},{23.011297,7.855505,1.518792},{367.021957,140.978831,1.623681}},0.929900,17981},
-{{4000,2.500000},323.299988,5586,423.704424,{{38.797749,21.597382,2.255635},{251.000488,91.998825,1.578603},{18.026772,5.066058,1.391451},{251.030630,91.982689,1.578333}},0.964500,12055},
-{{4000,2.600000},115.199997,5035,186.801069,{{33.282463,18.693394,2.281329},{179.000870,62.997711,1.543069},{14.484447,3.296385,1.294923},{179.037698,62.985522,1.542735}},0.981500,6798},
-{{4000,2.700000},62.900002,4619,87.573698,{{29.021425,16.355721,2.291339},{133.000748,44.997795,1.511321},{12.481228,2.866914,1.298321},{133.050606,44.994107,1.510969}},0.986400,6162},
-{{4000,2.800000},24.200001,4293,44.094961,{{25.327875,14.284839,2.293561},{102.003677,32.995995,1.478150},{10.527581,1.915938,1.223151},{102.048727,32.985352,1.477610}},0.991600,3946},
-{{4000,2.900000},11.700000,4035,24.467946,{{22.140371,12.315170,2.253427},{81.008255,24.987537,1.446041},{9.336193,1.507267,1.193249},{81.049467,24.942809,1.444562}},0.995000,2822},
-{{5000,2.100000},28673.699219,14768,16070.617009,{{92.939331,46.604073,2.005801},{1670.000732,638.998901,1.619784},{63.273116,31.939301,2.019338},{1670.003247,638.994800,1.619776}},0.568200,113056},
-{{5000,2.200000},9448.500000,11457,7078.373297,{{74.378052,38.521870,2.074344},{1053.000610,420.999878,1.666138},{45.024281,19.743986,1.781114},{1053.006641,420.991388,1.666110}},0.763700,65200},
-{{5000,2.300000},3352.399902,9360,3003.531309,{{60.691189,32.364967,2.142580},{663.006348,263.002197,1.657499},{33.218861,12.749260,1.622914},{663.011810,262.985123,1.657419}},0.874300,38108},
-{{5000,2.400000},1192.599976,7971,1245.007003,{{50.449287,27.491488,2.197479},{429.999756,164.997528,1.622627},{25.082837,8.300150,1.495105},{430.019009,164.981482,1.622483}},0.933300,24054},
-{{5000,2.500000},417.200012,7008,516.915848,{{42.446022,23.662001,2.259688},{291.000824,106.997162,1.581495},{19.438433,5.385362,1.384284},{291.027957,106.977089,1.581237}},0.963600,14023},
-{{5000,2.600000},161.500000,6314,222.779635,{{36.316803,20.451988,2.289141},{206.001297,71.998367,1.537290},{15.808651,3.894950,1.328203},{206.037643,71.970670,1.536826}},0.981100,10065},
-{{5000,2.700000},73.800003,5788,101.559223,{{31.423027,17.678207,2.286172},{152.001740,50.996536,1.504890},{13.257926,2.770471,1.264625},{152.045609,50.970143,1.504278}},0.988500,7592},
-{{5000,2.800000},35.799999,5378,49.555930,{{27.399818,15.319614,2.268159},{114.004074,35.994659,1.461414},{11.334561,2.186504,1.239796},{114.051771,35.974553,1.460756}},0.994200,5794},
-{{5000,2.900000},15.000000,5052,26.702686,{{24.251928,13.435301,2.242097},{89.006073,26.991325,1.435240},{9.925217,2.031204,1.257763},{89.071949,27.039070,1.435883}},0.997000,4198},
-{{6000,2.100000},36607.300781,17977,20621.395185,{{101.804878,50.394005,1.980221},{1981.001953,761.000488,1.623770},{68.843703,34.538908,2.006850},{1981.003284,760.996118,1.623764}},0.572800,148028},
-{{6000,2.200000},11798.400391,13875,8909.154190,{{81.146935,41.501446,2.046814},{1232.000854,495.000000,1.671641},{48.641115,21.675670,1.803843},{1232.005688,494.991064,1.671616}},0.764500,83791},
-{{6000,2.300000},3761.199951,11301,3702.607757,{{65.938995,34.830017,2.119613},{764.000549,303.000092,1.657266},{34.837449,12.467734,1.557643},{764.010284,302.987027,1.657206}},0.878800,49511},
-{{6000,2.400000},1392.300049,9607,1501.876270,{{54.523239,29.681850,2.194855},{490.002930,188.000336,1.622512},{26.653244,8.901016,1.501612},{490.018152,187.984113,1.622394}},0.939700,29976},
-{{6000,2.500000},507.100006,8437,608.968760,{{45.826401,25.348536,2.237850},{328.004944,120.002396,1.576928},{20.697833,5.672309,1.377775},{328.026910,119.978979,1.576689}},0.967100,17776},
-{{6000,2.600000},177.600006,7592,255.551431,{{39.015724,21.729435,2.257033},{231.000824,80.997665,1.539973},{16.490790,3.776190,1.297367},{231.031935,80.984848,1.539730}},0.983300,12711},
-{{6000,2.700000},85.300003,6958,114.038661,{{33.825348,18.874695,2.262466},{169.001434,56.997055,1.508882},{13.909489,2.845476,1.257383},{169.039752,56.961542,1.508230}},0.991700,8468},
-{{6000,2.800000},33.799999,6463,54.796217,{{29.418699,16.370958,2.254697},{128.002502,41.993309,1.488242},{11.887741,2.587546,1.278342},{128.048958,42.021859,1.488472}},0.994100,5990},
-{{6000,2.900000},12.400000,6071,29.124137,{{25.945839,14.548444,2.276471},{99.003548,29.993652,1.434628},{10.316709,1.756598,1.206123},{99.053488,29.965929,1.433739}},0.995800,4282},
-{{7000,2.100000},45112.601562,21228,25477.018839,{{109.915977,53.941422,1.963678},{2288.000732,880.999268,1.626154},{73.950944,37.164856,2.010305},{2288.002393,880.995801,1.626149}},0.574900,185722},
-{{7000,2.200000},14504.500000,16312,10823.149067,{{87.209373,44.389549,2.036659},{1406.001099,566.000610,1.673810},{51.930944,22.557087,1.767956},{1406.005359,565.992609,1.673790}},0.763800,103622},
-{{7000,2.300000},4366.200195,13249,4419.091636,{{70.630959,37.260883,2.116596},{862.000549,343.000610,1.660888},{36.893977,13.377516,1.568924},{862.009668,342.986481,1.660831}},0.881100,60040},
-{{7000,2.400000},1560.699951,11248,1761.810338,{{58.248589,31.456781,2.174119},{549.007385,211.003876,1.624265},{27.888712,8.856828,1.465837},{549.016199,210.982986,1.624149}},0.941500,35550},
-{{7000,2.500000},554.299988,9869,700.734282,{{48.792011,26.983294,2.237271},{365.000580,133.998978,1.580078},{21.651811,6.093179,1.391853},{365.024759,133.987970,1.579942}},0.970000,21283},
-{{7000,2.600000},209.199997,8874,287.209900,{{41.411163,23.337660,2.291264},{253.000809,87.998642,1.533318},{17.314385,4.017630,1.302915},{253.034230,87.981244,1.533049}},0.983100,14133},
-{{7000,2.700000},92.400002,8128,125.441797,{{35.717377,20.006317,2.273391},{185.002930,62.997543,1.516351},{14.434015,2.895905,1.251392},{185.038092,62.977442,1.515952}},0.991400,10249},
-{{7000,2.800000},39.299999,7547,59.120806,{{30.986992,17.188557,2.245689},{139.004608,44.997246,1.478657},{12.433061,2.732688,1.281793},{139.055133,45.036784,1.479021}},0.994800,6735},
-{{7000,2.900000},17.200001,7086,30.667648,{{27.305500,15.015825,2.221824},{107.004189,32.990974,1.445744},{10.774910,1.971649,1.224536},{107.055470,32.994648,1.445508}},0.996000,5140},
-{{8000,2.100000},54930.699219,24508,30582.816949,{{117.405540,57.339455,1.954606},{2592.003174,1000.999512,1.629162},{78.837447,39.199591,1.988951},{2592.002197,1000.995959,1.629159}},0.569800,226018},
-{{8000,2.200000},16600.800781,18763,12811.313245,{{92.868645,46.920334,2.021155},{1576.000488,634.999268,1.674812},{54.489750,23.490174,1.757816},{1576.004846,634.992932,1.674798}},0.775200,125539},
-{{8000,2.300000},5437.299805,15207,5151.833043,{{75.041489,39.221897,2.094985},{958.000488,381.999878,1.663194},{39.214698,14.409590,1.580960},{958.009393,381.988715,1.663151}},0.880200,73189},
-{{8000,2.400000},1841.699951,12890,2014.186394,{{61.729858,33.266563,2.168753},{603.000061,231.999054,1.625333},{29.285981,9.332986,1.467847},{603.015863,231.984180,1.625241}},0.938800,44842},
-{{8000,2.500000},595.799988,11300,787.083410,{{51.615322,28.271177,2.211061},{398.000610,145.999176,1.579358},{22.505553,6.217417,1.381930},{398.023029,145.983263,1.579207}},0.972000,26958},
-{{8000,2.600000},239.699997,10157,317.511728,{{43.850773,24.290663,2.241847},{275.002075,96.000244,1.536309},{18.043773,3.955632,1.281292},{275.030362,95.971730,1.535979}},0.985300,18009},
-{{8000,2.700000},89.599998,9298,135.855473,{{37.729996,20.966873,2.250774},{199.003571,66.998001,1.507539},{14.872482,2.947121,1.247828},{199.033197,66.973175,1.507142}},0.993100,11819},
-{{8000,2.800000},39.200001,8633,63.223250,{{32.625492,18.217312,2.264373},{149.002319,47.995636,1.475173},{12.848199,2.417562,1.232091},{149.048727,47.970296,1.474585}},0.994600,9472},
-{{8000,2.900000},14.800000,8105,32.582265,{{28.744526,15.977710,2.251503},{114.003250,33.991005,1.424823},{10.955302,1.692027,1.182855},{114.040749,33.966526,1.424188}},0.997100,6523},
-{{9000,2.100000},63796.199219,27813,35909.545005,{{124.538727,60.268539,1.937737},{2895.000732,1120.999023,1.631904},{83.029406,41.079701,1.979271},{2895.002271,1120.995947,1.631901}},0.574600,270558},
-{{9000,2.200000},19597.000000,21223,14855.197455,{{98.169006,49.328152,2.009977},{1742.000732,702.999512,1.676611},{57.400630,24.290786,1.733654},{1742.004797,702.993750,1.676599}},0.768700,144463},
-{{9000,2.300000},6024.700195,17165,5884.645513,{{78.999924,41.321991,2.096716},{1051.000122,419.999451,1.665609},{40.706408,14.617431,1.560422},{1051.008093,419.988159,1.665570}},0.892100,85198},
-{{9000,2.400000},2044.900024,14534,2271.926541,{{64.909157,34.835495,2.158339},{656.009216,252.002502,1.623758},{30.309579,9.470894,1.454751},{656.015106,251.988177,1.623692}},0.945000,49868},
-{{9000,2.500000},677.900024,12733,874.286296,{{54.080990,29.785347,2.225954},{431.000488,157.999359,1.578750},{23.291442,6.365966,1.376416},{431.021954,157.990649,1.578654}},0.971200,32921},
-{{9000,2.600000},242.000000,11442,347.996976,{{45.805653,25.533907,2.259581},{297.000519,103.998108,1.538844},{18.540194,4.078358,1.282515},{297.028763,103.978738,1.538610}},0.984400,19045},
-{{9000,2.700000},100.599998,10470,146.551128,{{39.396557,21.830559,2.242774},{214.001236,71.998550,1.507023},{15.467560,3.082867,1.249093},{214.035942,71.977658,1.506677}},0.991200,14602},
-{{9000,2.800000},56.599998,9721,67.219931,{{34.278774,19.068811,2.253705},{158.001770,49.996620,1.462910},{13.341544,2.652118,1.248647},{158.049921,49.987610,1.462581}},0.995100,10072},
-{{9000,2.900000},23.500000,9124,34.338849,{{29.863169,16.465981,2.229063},{123.003616,37.993973,1.446937},{11.553606,2.231010,1.240009},{123.053455,38.020374,1.447125}},0.997000,8295},
-{{10000,2.100000},73773.203125,31139,41432.648309,{{131.205093,63.073799,1.925768},{3193.025879,1236.993408,1.632399},{87.156013,42.749604,1.962695},{3193.003467,1236.996069,1.632409}},0.571600,312663},
-{{10000,2.200000},22349.900391,23694,16958.572014,{{103.103378,51.688717,2.005330},{1908.000488,771.998535,1.679575},{60.045984,25.542917,1.740325},{1908.004651,771.993237,1.679565}},0.770400,174173},
-{{10000,2.300000},7103.500000,19133,6638.382479,{{82.848549,43.054722,2.081945},{1140.016602,455.004700,1.664229},{42.752333,15.858104,1.589704},{1140.008118,454.989032,1.664199}},0.887500,96855},
-{{10000,2.400000},2264.300049,16186,2532.659426,{{67.885529,36.449402,2.159475},{709.000549,272.999268,1.626143},{31.425103,9.587207,1.439062},{709.014063,272.984003,1.626067}},0.948100,59246},
-{{10000,2.500000},757.799988,14170,961.174095,{{56.609100,30.917458,2.203405},{463.010132,171.006042,1.585629},{24.079075,6.211239,1.347905},{463.020560,170.985052,1.585494}},0.973500,35501},
-{{10000,2.600000},241.800003,12726,376.598800,{{47.862221,26.532421,2.243913},{317.006500,111.002090,1.538834},{19.004833,4.160289,1.280627},{317.024280,110.982187,1.538638}},0.988800,21488},
-{{10000,2.700000},116.500000,11645,156.372699,{{40.897427,22.837011,2.264479},{226.005020,74.999557,1.496668},{16.065015,3.533779,1.282426},{226.039008,74.980676,1.496369}},0.992800,14324},
-{{10000,2.800000},49.200001,10809,71.260206,{{35.439034,19.738016,2.257117},{169.004776,54.998993,1.482423},{13.473834,2.183555,1.193611},{169.032179,54.939469,1.481534}},0.996900,10643},
-{{10000,2.900000},19.600000,10143,35.606187,{{31.119295,17.090019,2.218168},{129.002609,39.993530,1.449320},{11.730234,2.211762,1.232468},{129.046376,40.026884,1.449642}},0.996700,6944}}
diff --git a/data/graphdata_canonical_properties_new2.m b/data/graphdata_canonical_properties1.m
similarity index 100%
rename from data/graphdata_canonical_properties_new2.m
rename to data/graphdata_canonical_properties1.m
diff --git a/data/graphdata_canonical_properties2.m b/data/graphdata_canonical_properties2.m
new file mode 100644
index 0000000000000000000000000000000000000000..ffccaf02c41047fc9ce92a5bd6cdf3ae7594b8f3
--- /dev/null
+++ b/data/graphdata_canonical_properties2.m
@@ -0,0 +1,106 @@
+(*
+n from 1000 to 10000 step 1000
+tauValues: {2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9}
+Canonical degree sequence.
+mixingTime: 50 * (50 - 5 (tau - 2)) n
+measurements: 500
+measureSkip: 20 n
+data:
+1: {n,tau}
+2: avgTriangles
+3: edges
+4: dstn
+5: empty
+6: switching successrate after mixing
+7: initial HH triangles
+*)
+{{{1000,2.100000},3940.944092,2702,1909.002542,{},0.429977,10611},
+{{1000,2.200000},1387.459961,2120,965.105599,{},0.676534,6718},
+{{1000,2.300000},534.312012,1760,477.559122,{},0.816561,4137},
+{{1000,2.400000},220.526001,1521,237.214498,{},0.893750,2868},
+{{1000,2.500000},95.571999,1352,119.740699,{},0.936643,2198},
+{{1000,2.600000},43.712002,1227,62.648837,{},0.960899,1138},
+{{1000,2.700000},21.580000,1131,34.946920,{},0.974672,762},
+{{1000,2.800000},11.176000,1056,20.691035,{},0.983023,762},
+{{1000,2.900000},6.076000,995,12.996577,{},0.988134,567},
+{{2000,2.100000},10096.120117,5738,4928.613586,{},0.451236,29937},
+{{2000,2.200000},3293.724121,4426,2338.627667,{},0.702543,18195},
+{{2000,2.300000},1182.109985,3634,1075.881226,{},0.840220,11595},
+{{2000,2.400000},454.862000,3117,493.100917,{},0.912315,6326},
+{{2000,2.500000},180.395996,2754,227.015942,{},0.950992,4860},
+{{2000,2.600000},77.353996,2490,109.335750,{},0.971141,2988},
+{{2000,2.700000},35.161999,2289,55.369715,{},0.982497,1903},
+{{2000,2.800000},17.208000,2131,30.137451,{},0.988801,1870},
+{{2000,2.900000},9.070000,2006,18.039160,{},0.992407,1184},
+{{3000,2.100000},17454.968750,8889,8554.015301,{},0.462654,54312},
+{{3000,2.200000},5452.903809,6790,3906.442980,{},0.716521,31922},
+{{3000,2.300000},1871.942017,5539,1721.274934,{},0.852359,19295},
+{{3000,2.400000},681.254028,4729,750.256130,{},0.922100,11873},
+{{3000,2.500000},261.660004,4168,329.159810,{},0.957829,7503},
+{{3000,2.600000},107.832001,3761,150.448326,{},0.976078,4994},
+{{3000,2.700000},47.178001,3453,72.816769,{},0.985807,3306},
+{{3000,2.800000},21.848000,3212,37.820628,{},0.991243,2836},
+{{3000,2.900000},10.994000,3020,21.492990,{},0.994236,2507},
+{{4000,2.100000},25663.001953,12109,12608.579365,{},0.470905,83247},
+{{4000,2.200000},7769.425781,9186,5604.951018,{},0.726735,48088},
+{{4000,2.300000},2586.879883,7462,2394.223038,{},0.861188,27467},
+{{4000,2.400000},919.070007,6353,1008.084985,{},0.928405,17627},
+{{4000,2.500000},342.936005,5588,426.916283,{},0.962184,11013},
+{{4000,2.600000},137.199997,5036,187.910666,{},0.979068,6819},
+{{4000,2.700000},57.363998,4619,87.573698,{},0.987906,6162},
+{{4000,2.800000},25.792000,4293,44.094961,{},0.992611,3946},
+{{4000,2.900000},12.800000,4035,24.467946,{},0.995209,2822},
+{{5000,2.100000},34553.554688,15379,17027.311209,{},0.477348,115667},
+{{5000,2.200000},10182.750000,11608,7418.679638,{},0.733874,64788},
+{{5000,2.300000},3327.256104,9399,3094.307125,{},0.867116,38222},
+{{5000,2.400000},1145.764038,7981,1265.258732,{},0.933085,22995},
+{{5000,2.500000},423.980011,7011,521.640501,{},0.965179,13977},
+{{5000,2.600000},160.582001,6314,222.779635,{},0.981166,10065},
+{{5000,2.700000},66.902000,5788,101.559223,{},0.989227,7592},
+{{5000,2.800000},29.590000,5379,49.933139,{},0.993527,5841},
+{{5000,2.900000},14.352000,5052,26.702686,{},0.995909,4198},
+{{6000,2.100000},44111.960938,18695,21775.430020,{},0.482196,151034},
+{{6000,2.200000},12728.856445,14046,9304.518682,{},0.739967,83595},
+{{6000,2.300000},4080.758057,11341,3799.599438,{},0.872163,50315},
+{{6000,2.400000},1378.182007,9617,1523.479648,{},0.936486,29756},
+{{6000,2.500000},487.302002,8440,613.764349,{},0.967600,18495},
+{{6000,2.600000},186.136002,7592,255.551431,{},0.982732,12711},
+{{6000,2.700000},75.538002,6958,114.038661,{},0.990249,8468},
+{{6000,2.800000},33.340000,6463,54.796217,{},0.994210,5990},
+{{6000,2.900000},15.528000,6071,29.124137,{},0.996365,4282},
+{{7000,2.100000},54134.992188,22040,26774.216552,{},0.486476,189649},
+{{7000,2.200000},15375.274414,16502,11283.939164,{},0.744961,102788},
+{{7000,2.300000},4807.368164,13292,4524.977074,{},0.876052,61500},
+{{7000,2.400000},1605.015991,11259,1784.770941,{},0.939318,36714},
+{{7000,2.500000},565.737976,9872,705.029604,{},0.969435,21816},
+{{7000,2.600000},211.488007,8875,288.260048,{},0.983913,14286},
+{{7000,2.700000},83.945999,8128,125.376354,{},0.991062,10215},
+{{7000,2.800000},36.161999,7547,59.120806,{},0.994767,6735},
+{{7000,2.900000},16.506001,7086,30.667648,{},0.996757,5140},
+{{8000,2.100000},64640.007812,25412,32028.683443,{},0.490222,230934},
+{{8000,2.200000},18047.988281,18966,13307.944183,{},0.749229,124793},
+{{8000,2.300000},5608.804199,15254,5274.683255,{},0.879395,74444},
+{{8000,2.400000},1831.975952,12902,2040.791100,{},0.941634,42758},
+{{8000,2.500000},635.343994,11303,791.872547,{},0.971031,26481},
+{{8000,2.600000},233.897995,10158,318.525711,{},0.984895,18133},
+{{8000,2.700000},92.786003,9298,135.855473,{},0.991733,11819},
+{{8000,2.800000},38.380001,8633,63.223250,{},0.995202,9472},
+{{8000,2.900000},18.186001,8105,32.582265,{},0.997035,6523},
+{{9000,2.100000},75604.476562,28811,37512.931936,{},0.493475,272659},
+{{9000,2.200000},20830.273438,21446,15418.108991,{},0.752836,149087},
+{{9000,2.300000},6363.474121,17215,6018.658658,{},0.882392,85473},
+{{9000,2.400000},2052.724121,14545,2297.085264,{},0.943692,50395},
+{{9000,2.500000},698.955994,12737,879.558057,{},0.972253,30776},
+{{9000,2.600000},254.871994,11442,347.996976,{},0.985734,19045},
+{{9000,2.700000},99.150002,10470,146.551128,{},0.992238,14602},
+{{9000,2.800000},41.812000,9721,67.219931,{},0.995531,10072},
+{{9000,2.900000},18.492001,9124,34.338849,{},0.997249,8295},
+{{10000,2.100000},86804.312500,32227,43182.906580,{},0.496208,317173},
+{{10000,2.200000},23654.505859,23931,17560.699970,{},0.756108,170831},
+{{10000,2.300000},7143.855957,19188,6787.558771,{},0.884878,95979},
+{{10000,2.400000},2291.991943,16196,2556.177526,{},0.945402,58489},
+{{10000,2.500000},774.911987,14172,964.595686,{},0.973380,34943},
+{{10000,2.600000},279.462006,12726,376.598800,{},0.986413,21488},
+{{10000,2.700000},105.942001,11645,156.372699,{},0.992687,14324},
+{{10000,2.800000},44.731998,10809,71.260206,{},0.995800,10643},
+{{10000,2.900000},20.007999,10143,35.606187,{},0.997458,6944}}
diff --git a/data/graphdata_canonical_properties_new.m b/data/graphdata_canonical_properties_new.m
deleted file mode 100644
index c67b33032fea680aee2afb4ee7a44ab97d357ee1..0000000000000000000000000000000000000000
--- a/data/graphdata_canonical_properties_new.m
+++ /dev/null
@@ -1,104 +0,0 @@
-(*
-n from 1000 to 10000 step 1000
-tauValues: {2.1,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9}
-Canonical degree sequence. NEW SAMPLER
-mixingTime: 50 * (50 - 10 (tau - 2)) n
-data:
-1: {n,tau}
-2: avgTriangles
-3: edges
-4: dstn
-5: empty
-6: switching successrate after mixing
-7: initial HH triangles
-*)
-{{{1000,2.100000},3946.399902,2702,1909.002542,{},0.426800,10611},
-{{1000,2.200000},1374.000000,2120,965.105599,{},0.672100,6718},
-{{1000,2.300000},561.299988,1760,477.559122,{},0.813300,4137},
-{{1000,2.400000},231.000000,1521,237.214498,{},0.896500,2868},
-{{1000,2.500000},93.400002,1352,119.740699,{},0.935200,2198},
-{{1000,2.600000},48.799999,1227,62.648837,{},0.958400,1138},
-{{1000,2.700000},22.500000,1131,34.946920,{},0.975700,762},
-{{1000,2.800000},11.700000,1056,20.691035,{},0.982900,762},
-{{1000,2.900000},7.500000,995,12.996577,{},0.987900,567},
-{{2000,2.100000},10037.400391,5738,4928.613586,{},0.455500,29937},
-{{2000,2.200000},3287.899902,4426,2338.627667,{},0.702550,18195},
-{{2000,2.300000},1178.099976,3634,1075.881226,{},0.838550,11595},
-{{2000,2.400000},478.299988,3117,493.100917,{},0.911650,6326},
-{{2000,2.500000},180.100006,2754,227.015942,{},0.950600,4860},
-{{2000,2.600000},69.500000,2490,109.335750,{},0.972850,2988},
-{{2000,2.700000},32.599998,2289,55.369715,{},0.982600,1903},
-{{2000,2.800000},14.800000,2131,30.137451,{},0.989950,1870},
-{{2000,2.900000},8.500000,2006,18.039160,{},0.991900,1184},
-{{3000,2.100000},17363.099609,8889,8554.015301,{},0.465400,54312},
-{{3000,2.200000},5529.899902,6790,3906.442980,{},0.717800,31922},
-{{3000,2.300000},1886.800049,5539,1721.274934,{},0.847567,19295},
-{{3000,2.400000},661.599976,4729,750.256130,{},0.924933,11873},
-{{3000,2.500000},266.899994,4168,329.159810,{},0.956933,7503},
-{{3000,2.600000},106.699997,3761,150.448326,{},0.974167,4994},
-{{3000,2.700000},43.099998,3453,72.816769,{},0.985267,3306},
-{{3000,2.800000},22.400000,3212,37.820628,{},0.990567,2836},
-{{3000,2.900000},11.500000,3020,21.492990,{},0.994867,2507},
-{{4000,2.100000},25596.400391,12109,12608.579365,{},0.476375,83247},
-{{4000,2.200000},7632.799805,9186,5604.951018,{},0.727675,48088},
-{{4000,2.300000},2532.899902,7462,2394.223038,{},0.859675,27467},
-{{4000,2.400000},920.599976,6353,1008.084985,{},0.928600,17627},
-{{4000,2.500000},348.799988,5588,426.916283,{},0.961325,11013},
-{{4000,2.600000},128.800003,5036,187.910666,{},0.978600,6819},
-{{4000,2.700000},54.700001,4619,87.573698,{},0.987650,6162},
-{{4000,2.800000},24.400000,4293,44.094961,{},0.992875,3946},
-{{4000,2.900000},11.500000,4035,24.467946,{},0.995050,2822},
-{{5000,2.100000},34435.800781,15379,17027.311209,{},0.474440,115667},
-{{5000,2.200000},10228.900391,11608,7418.679638,{},0.732180,64788},
-{{5000,2.300000},3294.100098,9399,3094.307125,{},0.866120,38222},
-{{5000,2.400000},1084.000000,7981,1265.258732,{},0.932840,22995},
-{{5000,2.500000},439.299988,7011,521.640501,{},0.965320,13977},
-{{5000,2.600000},170.600006,6314,222.779635,{},0.980780,10065},
-{{5000,2.700000},68.400002,5788,101.559223,{},0.989360,7592},
-{{5000,2.800000},25.200001,5379,49.933139,{},0.993260,5841},
-{{5000,2.900000},13.100000,5052,26.702686,{},0.995660,4198},
-{{6000,2.100000},43529.601562,18695,21775.430020,{},0.481100,151034},
-{{6000,2.200000},12677.900391,14046,9304.518682,{},0.739900,83595},
-{{6000,2.300000},4048.199951,11341,3799.599438,{},0.872350,50315},
-{{6000,2.400000},1355.500000,9617,1523.479648,{},0.935183,29756},
-{{6000,2.500000},520.099976,8440,613.764349,{},0.966033,18495},
-{{6000,2.600000},169.199997,7592,255.551431,{},0.983783,12711},
-{{6000,2.700000},69.300003,6958,114.038661,{},0.989750,8468},
-{{6000,2.800000},34.599998,6463,54.796217,{},0.994467,5990},
-{{6000,2.900000},14.800000,6071,29.124137,{},0.996467,4282},
-{{7000,2.100000},54373.000000,22040,26774.216552,{},0.485071,189649},
-{{7000,2.200000},15294.799805,16502,11283.939164,{},0.746243,102788},
-{{7000,2.300000},4875.899902,13292,4524.977074,{},0.875700,61500},
-{{7000,2.400000},1627.800049,11259,1784.770941,{},0.938429,36714},
-{{7000,2.500000},556.500000,9872,705.029604,{},0.969929,21816},
-{{7000,2.600000},205.100006,8875,288.260048,{},0.983500,14286},
-{{7000,2.700000},78.000000,8128,125.376354,{},0.991043,10215},
-{{7000,2.800000},34.400002,7547,59.120806,{},0.994743,6735},
-{{7000,2.900000},18.000000,7086,30.667648,{},0.996343,5140},
-{{8000,2.100000},64969.699219,25412,32028.683443,{},0.487388,230934},
-{{8000,2.200000},17935.699219,18966,13307.944183,{},0.750000,124793},
-{{8000,2.300000},5613.299805,15254,5274.683255,{},0.879462,74444},
-{{8000,2.400000},1870.000000,12902,2040.791100,{},0.942163,42758},
-{{8000,2.500000},634.000000,11303,791.872547,{},0.970587,26481},
-{{8000,2.600000},231.699997,10158,318.525711,{},0.984700,18133},
-{{8000,2.700000},90.599998,9298,135.855473,{},0.991875,11819},
-{{8000,2.800000},38.500000,8633,63.223250,{},0.995300,9472},
-{{8000,2.900000},18.400000,8105,32.582265,{},0.997000,6523},
-{{9000,2.100000},75186.101562,28811,37512.931936,{},0.494644,272659},
-{{9000,2.200000},20731.300781,21446,15418.108991,{},0.754478,149087},
-{{9000,2.300000},6277.600098,17215,6018.658658,{},0.882389,85473},
-{{9000,2.400000},2014.400024,14545,2297.085264,{},0.944511,50395},
-{{9000,2.500000},717.000000,12737,879.558057,{},0.972178,30776},
-{{9000,2.600000},260.500000,11442,347.996976,{},0.985511,19045},
-{{9000,2.700000},94.000000,10470,146.551128,{},0.991722,14602},
-{{9000,2.800000},47.000000,9721,67.219931,{},0.995322,10072},
-{{9000,2.900000},18.500000,9124,34.338849,{},0.997622,8295},
-{{10000,2.100000},86369.703125,32227,43182.906580,{},0.499710,317173},
-{{10000,2.200000},23790.300781,23931,17560.699970,{},0.757800,170831},
-{{10000,2.300000},6999.899902,19188,6787.558771,{},0.884230,95979},
-{{10000,2.400000},2276.699951,16196,2556.177526,{},0.946730,58489},
-{{10000,2.500000},785.200012,14172,964.595686,{},0.972900,34943},
-{{10000,2.600000},283.600006,12726,376.598800,{},0.986000,21488},
-{{10000,2.700000},106.000000,11645,156.372699,{},0.992050,14324},
-{{10000,2.800000},44.200001,10809,71.260206,{},0.995680,10643},
-{{10000,2.900000},22.100000,10143,35.606187,{},0.997450,6944}}