diff --git a/showgraphs.m b/showgraphs.m index 48127315c852e3851039ad2d997733725205fc14..f4e1275e013b13cfb135af99cdaf0bfa59a9e57f 100644 --- a/showgraphs.m +++ b/showgraphs.m @@ -17,7 +17,7 @@ Needs["ErrorBarPlots`"] (* (a) Don't remove/add edges from the std::vector. Simply replace them*) (* (b) Better direct triangle counting? (I doubt it)*) (* (b') Better triangle counting by only keeping track of CHANGES in #triangles*) -(* (c) Do not choose the three permutations with 1/3 probability: choose the "staying" one with a very low probability. Should still be a valid switch chain?*) +(* (c) Do not choose the three permutations with 1/3 probability: choose the "staying" one with zero probability. Should still be a valid switch chain?*) (**) (*- Experimental mixing time as function of n. At (n,tau)=(1000,2.5) it seems to be between 10.000 and 20.000 steps.*) (**) @@ -62,7 +62,7 @@ Grid[Partition[gs,10],Frame->All] (*Data import and data merge*) -gsraw=Import[NotebookDirectory[]<>"data/min_deg_two/graphdata_merged.m"]; +gsraw=Import[NotebookDirectory[]<>"data/graphdata_merged.m"]; gsraw=SortBy[gsraw,#[[1,1]]&]; (* Sort by n *) @@ -70,9 +70,9 @@ gdata=GatherBy[gsraw,{#[[1,2]]&,#[[1,1]]&}]; (* gdata[[ tau index, n index, run index , {ntau, #tris, ds} ]] *) -newData=Import[NotebookDirectory[]<>"graphdata_tau_multi4.m"]; -mergedData=Import[NotebookDirectory[]<>"graphdata_merged.m"]; -Export[NotebookDirectory[]<>"graphdata_merged_new.m",Join[mergedData,newData]] +newData=Import[NotebookDirectory[]<>"data/graphdata_3.m"]; +mergedData=Import[NotebookDirectory[]<>"data/graphdata_merged.m"]; +Export[NotebookDirectory[]<>"data/graphdata_merged_new.m",Join[mergedData,newData]] (* ::Subsection:: *) @@ -151,12 +151,6 @@ ErrorListPlot[averagesErrorBars,Joined->True,PlotMarkers->Automatic,AxesLabel->{ ListLogLogPlot[averagesErrorBars[[All,All,1]],Joined->True,PlotMarkers->Automatic,AxesLabel->{"n","\[LeftAngleBracket]triangles\[RightAngleBracket]"},PlotLegends->taulabels] -averagesErrorBars=Map[ -{{Log[#[[1,1,1]]],Log[Mean[#[[All,2]]]]}, -ErrorBar[ (StandardDeviation[#[[All,2]]] )] -}&,averagesGrouped,{2}]; - - (* ::Subsection:: *) (*Fitting the log-log-plot*)