--- a/test-data/swiss_r.txt	Thu Oct 11 03:37:34 2018 -0400
+++ b/test-data/swiss_r.txt	Sun Dec 30 02:01:29 2018 -0500
@@ -1,101 +1,101 @@
 0	1	2	0
--9.022432560391366	16.34407352444682	-3.911586790185589	9.833859899549347
-3.6324989224084425	16.371566370825743	6.373479468911753	7.335958625969624
--6.5999037486787	12.81689121739727	5.688948917237484	8.713373013636033
-12.600582699437291	6.489007319012446	1.3642134579818455	12.674216454057314
-0.21148781431603128	14.652433057772075	-4.752159504191911	4.756863152213408
-5.336919430343019	18.05198421031037	-2.4156207389915676	5.8581509506514955
-0.4244400906317155	13.13179891289296	-11.025883810051546	11.034050171323868
-12.464824437123061	20.630564421800543	-0.8802638610387414	12.495867825539413
-5.763177385414243	20.50650266733296	-1.6720065493379934	6.000818233939377
--7.699034264457019	3.5005767551760205	-6.587317375235983	10.13251591695612
-11.202785903218851	0.4867408660464758	6.815111686710793	13.112900491336806
-6.154126712593873	3.3756355186487146	2.6083615537589355	6.684072530260963
-6.3594207906583025	19.393433330440836	1.1301790428043181	6.459066299508866
-4.890112220636909	20.024546847470212	-2.9939039914563663	5.7338171090889185
-5.953270969209806	4.430546793087373	3.2507699778706525	6.782989066913009
-2.7886170145191778	7.571030267106772	13.653840981957098	13.935700858379423
-12.105857407807882	11.536880494181116	-2.5050413988504086	12.362322435049629
-6.325072045560973	5.708447832716414	0.31467565998177954	6.332894847739211
-12.244209556605643	9.672634042571852	-1.9916032459947095	12.405126003210512
-3.8660308550048237	14.619392861291091	6.186900234417021	7.295473191128778
--7.0239788069091595	10.507473830172165	5.269869801725942	8.781105056144815
-7.26899971380247	15.037490801851058	11.461229291605976	13.571961306827662
-12.283126381654526	11.045074660825358	-1.8290053478621142	12.418552825116365
--0.20634108007216687	0.02937948549992042	7.877467511574221	7.880169480235352
-6.343991033788326	8.288706020486545	0.5239838932388041	6.365593558904021
--2.992114463212683	10.335506367924149	7.662793944465749	8.226248233326507
-0.2553968816308009	8.460486958961985	-4.759153972628113	4.766001899110898
-4.898443435012139	7.440264302232732	5.1277610747119375	7.091451313049004
-11.449745837470637	10.512900708302018	-4.244989534482564	12.211331454454207
-0.6957906323135219	9.348709205453904	-4.806058806318065	4.8561636971793565
--6.178282122978317	1.899088552125153	-8.311613297429309	10.35635484121306
--5.809147798696848	5.7448213205762535	-8.630095917611289	10.40311269256829
-4.771282961878387	19.813019052597266	-3.1246490395170863	5.70338256848215
--3.676286947033984	0.5574374680127813	7.454949508307122	8.312121142544846
-1.7041667772049045	0.8399724824536665	-4.760320110473833	5.0561677146541095
-11.253479680884357	5.94594755411621	6.714343194698412	13.104320259527771
-2.4962611844455296	12.229227574552146	13.73230884573197	13.957350254813335
-2.82529764315011	20.808748861421368	-4.45734155189065	5.277328915521612
-11.246053659264389	20.84548698546233	6.7292408015927405	13.105586773314442
--7.598421450999555	20.85546482210194	-6.728856459556753	10.149557517464928
-7.673105198623886	2.3110149502978223	-8.845890909442362	11.710095190514206
--3.590766593212459	13.954110365242743	-10.028250288573874	10.651732656108704
--7.310355446606637	11.00372352425457	-7.107715265782408	10.196122451950428
-0.9390427269626991	3.6361481059833514	-4.81429662072219	4.905023261449291
-6.140803817320717	19.80216514321554	2.6591895538494246	6.691842840811685
--8.985600378339388	5.079061805501299	-4.025069673184332	9.845923015807161
-9.836407362386318	20.977577645707452	-6.805416213807093	11.961128694314606
-4.969988627449396	12.236570118147872	5.0355496572708605	7.075135850838273
-3.20231600088142	3.8488590132420915	6.678864199480768	7.406892382410254
-12.54088626453474	8.123753860273595	2.277561124484857	12.746023418139512
-3.2444388112344487	3.983144107155142	13.517704725715975	13.901608692935088
-11.5432848954881	8.62618413353151	6.0914346281664	13.05193479939386
--1.978139139431402	12.488281446935813	7.85543311765692	8.100670584644924
--6.177149980902341	15.048307955695137	-8.312637547021756	10.356501575084014
--1.618507468215522	10.224721129751593	7.892004821334231	8.0562588417101
--0.5113805630576186	6.501386173100796	7.902076591710388	7.9186062246793405
-6.353818555778558	12.126268829384795	0.6861767157853099	6.390762765511003
-5.45211008381264	9.275864210943602	4.3143017595762805	6.952604119227159
-2.107134481947034	7.553240154611261	-4.6829825175653195	5.135206031390815
--9.463555191591388	6.747970572185086	-0.48486315240582095	9.475967979096236
--3.250226531143291	4.372352044116476	7.592008891419129	8.258484819331864
--6.604520002414596	9.476431105298522	-7.903097491982883	10.29944825852728
--3.6128614172805995	10.328701115545131	-10.01788625769654	10.64945128598746
-5.901240165772	18.880602610667935	-1.3619562859809635	6.056365281176806
-7.890684802801195	15.316569681618265	10.970663061010866	13.513635878452032
-6.599437952039687	16.171885231313606	11.927851500770677	13.63180922354986
--5.9231007276421455	7.8842241988017525	-8.534995422938826	10.388901246011612
--4.1066018271801985	7.218530239943072	7.289891059327897	8.36700007313664
--2.258989126121089	13.75573932598577	7.815431761150413	8.135355277130309
-6.22411695981015	14.931797857420449	2.30810881728065	6.638297842203604
-3.720764705951612	2.384289079592201	6.3048062946018115	7.320838231343854
-5.134908769038546	2.793602476845076	4.810103131264821	7.035934920090762
-6.335025161866016	9.576820209728602	0.4150330402131886	6.348605848998987
-4.278436462541465	3.3544608333287127	13.143655442744256	13.82247072565484
-5.412525015450138	20.194479979267562	12.620338860302773	13.732020244368336
--6.241257651981322	17.589930642098004	-8.254155357899235	10.348158181567968
-6.6400017029745415	10.92337442779639	-9.517367265589035	11.604736200517896
--0.5260249957996649	4.583717412291242	7.902957223016857	7.920444126754531
-4.256315102839512	2.8332931731803743	-3.6083374546478515	5.579992602259815
--8.54867168512033	20.560477255161246	3.062731112450952	9.080754894123787
--9.474830838000726	14.847913409472007	-0.7785404251532075	9.506763098043795
-4.106531950879499	18.059486695858926	-3.727692624842863	5.546106469308181
--9.352746779428074	8.13062518440142	-2.5303993126077104	9.68900371562256
-1.03845201115681	5.267514416466221	14.024865345489724	14.063258176489338
--4.633677541056066	6.288198397838747	7.048896684872887	8.435514923731649
--0.1679620862896378	17.99480609650533	7.873519603731706	7.875310928006478
-11.881189424840937	9.932663801932643	-3.1961624526929864	12.30358145309554
-8.694908808450117	13.928817987338693	-8.009826278144502	11.821960759252995
-1.45482693805244	16.92030075617249	7.523602741539789	7.66297067932457
--3.2353326673116114	5.312590597644206	-10.186604228879451	10.688043936286864
--9.103169624547348	1.6710422183768223	-3.644412618463142	9.805582111577818
-2.535323074334916	15.387972705330018	7.0686838865278725	7.50960418257273
-4.976519330225636	20.189347027575714	-2.8934429585543997	5.7565403497689
-1.4842539092006284	20.02989941752092	7.51375887065696	7.658954369452367
--8.288031531595307	10.300480089561892	3.557610304744918	9.019315813804575
--0.7947079435754046	13.276033353087858	-10.89380414305644	10.922752831720377
-4.820925920452835	15.392895416597838	5.224215336558182	7.108709630673047
--2.5663079257383234	18.95059956820729	-10.443947716323434	10.75462599400857
-6.273175805783373	3.4071852937122014	2.0463610386400113	6.598509543126363
--0.9286287852994032	8.523507769718787	-10.870765064080713	10.910356753989504
+-9.02243256039137	16.34407352444682	-3.91158679018559	9.83385989954935
+3.63249892240844	16.37156637082574	6.37347946891175	7.33595862596962
+-6.59990374867870	12.81689121739727	5.68894891723748	8.71337301363603
+12.60058269943729	6.48900731901245	1.36421345798185	12.67421645405731
+0.21148781431603	14.65243305777208	-4.75215950419191	4.75686315221341
+5.33691943034302	18.05198421031037	-2.41562073899157	5.85815095065150
+0.42444009063172	13.13179891289296	-11.02588381005155	11.03405017132387
+12.46482443712306	20.63056442180054	-0.88026386103874	12.49586782553941
+5.76317738541424	20.50650266733296	-1.67200654933799	6.00081823393938
+-7.69903426445702	3.50057675517602	-6.58731737523598	10.13251591695612
+11.20278590321885	0.48674086604648	6.81511168671079	13.11290049133681
+6.15412671259387	3.37563551864871	2.60836155375894	6.68407253026096
+6.35942079065830	19.39343333044084	1.13017904280432	6.45906629950887
+4.89011222063691	20.02454684747021	-2.99390399145637	5.73381710908892
+5.95327096920981	4.43054679308737	3.25076997787065	6.78298906691301
+2.78861701451918	7.57103026710677	13.65384098195710	13.93570085837942
+12.10585740780788	11.53688049418112	-2.50504139885041	12.36232243504963
+6.32507204556097	5.70844783271641	0.31467565998178	6.33289484773921
+12.24420955660564	9.67263404257185	-1.99160324599471	12.40512600321051
+3.86603085500482	14.61939286129109	6.18690023441702	7.29547319112878
+-7.02397880690916	10.50747383017216	5.26986980172594	8.78110505614482
+7.26899971380247	15.03749080185106	11.46122929160598	13.57196130682766
+12.28312638165453	11.04507466082536	-1.82900534786211	12.41855282511636
+-0.20634108007217	0.02937948549992	7.87746751157422	7.88016948023535
+6.34399103378833	8.28870602048655	0.52398389323880	6.36559355890402
+-2.99211446321268	10.33550636792415	7.66279394446575	8.22624823332651
+0.25539688163080	8.46048695896198	-4.75915397262811	4.76600189911090
+4.89844343501214	7.44026430223273	5.12776107471194	7.09145131304900
+11.44974583747064	10.51290070830202	-4.24498953448257	12.21133145445421
+0.69579063231352	9.34870920545390	-4.80605880631806	4.85616369717936
+-6.17828212297832	1.89908855212515	-8.31161329742931	10.35635484121306
+-5.80914779869685	5.74482132057625	-8.63009591761129	10.40311269256829
+4.77128296187839	19.81301905259727	-3.12464903951709	5.70338256848215
+-3.67628694703398	0.55743746801278	7.45494950830712	8.31212114254485
+1.70416677720490	0.83997248245367	-4.76032011047383	5.05616771465411
+11.25347968088436	5.94594755411621	6.71434319469841	13.10432025952777
+2.49626118444553	12.22922757455215	13.73230884573197	13.95735025481333
+2.82529764315011	20.80874886142137	-4.45734155189065	5.27732891552161
+11.24605365926439	20.84548698546233	6.72924080159274	13.10558677331444
+-7.59842145099956	20.85546482210194	-6.72885645955675	10.14955751746493
+7.67310519862389	2.31101495029782	-8.84589090944236	11.71009519051421
+-3.59076659321246	13.95411036524274	-10.02825028857387	10.65173265610870
+-7.31035544660664	11.00372352425457	-7.10771526578241	10.19612245195043
+0.93904272696270	3.63614810598335	-4.81429662072219	4.90502326144929
+6.14080381732072	19.80216514321554	2.65918955384942	6.69184284081168
+-8.98560037833939	5.07906180550130	-4.02506967318433	9.84592301580716
+9.83640736238632	20.97757764570745	-6.80541621380709	11.96112869431461
+4.96998862744940	12.23657011814787	5.03554965727086	7.07513585083827
+3.20231600088142	3.84885901324209	6.67886419948077	7.40689238241025
+12.54088626453474	8.12375386027360	2.27756112448486	12.74602341813951
+3.24443881123445	3.98314410715514	13.51770472571597	13.90160869293509
+11.54328489548810	8.62618413353151	6.09143462816640	13.05193479939386
+-1.97813913943140	12.48828144693581	7.85543311765692	8.10067058464492
+-6.17714998090234	15.04830795569514	-8.31263754702176	10.35650157508401
+-1.61850746821552	10.22472112975159	7.89200482133423	8.05625884171010
+-0.51138056305762	6.50138617310080	7.90207659171039	7.91860622467934
+6.35381855577856	12.12626882938480	0.68617671578531	6.39076276551100
+5.45211008381264	9.27586421094360	4.31430175957628	6.95260411922716
+2.10713448194703	7.55324015461126	-4.68298251756532	5.13520603139082
+-9.46355519159139	6.74797057218509	-0.48486315240582	9.47596797909624
+-3.25022653114329	4.37235204411648	7.59200889141913	8.25848481933186
+-6.60452000241460	9.47643110529852	-7.90309749198288	10.29944825852728
+-3.61286141728060	10.32870111554513	-10.01788625769654	10.64945128598746
+5.90124016577200	18.88060261066794	-1.36195628598096	6.05636528117681
+7.89068480280119	15.31656968161827	10.97066306101087	13.51363587845203
+6.59943795203969	16.17188523131361	11.92785150077068	13.63180922354986
+-5.92310072764215	7.88422419880175	-8.53499542293883	10.38890124601161
+-4.10660182718020	7.21853023994307	7.28989105932790	8.36700007313664
+-2.25898912612109	13.75573932598577	7.81543176115041	8.13535527713031
+6.22411695981015	14.93179785742045	2.30810881728065	6.63829784220360
+3.72076470595161	2.38428907959220	6.30480629460181	7.32083823134385
+5.13490876903855	2.79360247684508	4.81010313126482	7.03593492009076
+6.33502516186602	9.57682020972860	0.41503304021319	6.34860584899899
+4.27843646254146	3.35446083332871	13.14365544274426	13.82247072565484
+5.41252501545014	20.19447997926756	12.62033886030277	13.73202024436834
+-6.24125765198132	17.58993064209800	-8.25415535789923	10.34815818156797
+6.64000170297454	10.92337442779639	-9.51736726558904	11.60473620051790
+-0.52602499579966	4.58371741229124	7.90295722301686	7.92044412675453
+4.25631510283951	2.83329317318037	-3.60833745464785	5.57999260225982
+-8.54867168512033	20.56047725516125	3.06273111245095	9.08075489412379
+-9.47483083800073	14.84791340947201	-0.77854042515321	9.50676309804379
+4.10653195087950	18.05948669585893	-3.72769262484286	5.54610646930818
+-9.35274677942807	8.13062518440142	-2.53039931260771	9.68900371562256
+1.03845201115681	5.26751441646622	14.02486534548972	14.06325817648934
+-4.63367754105607	6.28819839783875	7.04889668487289	8.43551492373165
+-0.16796208628964	17.99480609650533	7.87351960373171	7.87531092800648
+11.88118942484094	9.93266380193264	-3.19616245269299	12.30358145309554
+8.69490880845012	13.92881798733869	-8.00982627814450	11.82196075925300
+1.45482693805244	16.92030075617249	7.52360274153979	7.66297067932457
+-3.23533266731161	5.31259059764421	-10.18660422887945	10.68804393628686
+-9.10316962454735	1.67104221837682	-3.64441261846314	9.80558211157782
+2.53532307433492	15.38797270533002	7.06868388652787	7.50960418257273
+4.97651933022564	20.18934702757571	-2.89344295855440	5.75654034976890
+1.48425390920063	20.02989941752092	7.51375887065696	7.65895436945237
+-8.28803153159531	10.30048008956189	3.55761030474492	9.01931581380457
+-0.79470794357540	13.27603335308786	-10.89380414305644	10.92275283172038
+4.82092592045283	15.39289541659784	5.22421533655818	7.10870963067305
+-2.56630792573832	18.95059956820729	-10.44394771632344	10.75462599400857
+6.27317580578337	3.40718529371220	2.04636103864001	6.59850954312636
+-0.92862878529940	8.52350776971879	-10.87076506408071	10.91035675398950